m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Reset extensions streams on chromium prerender workaround (#19727)

Browse Source 
This temporary workaround checks if a page in chromium is a prerendering via `document.prerendering` and then resets the extension stream when this state changes from prerendered to active.
This commit is contained in:
jiexi 2023-06-27 09:10:04 -07:00 committed by GitHub
parent bf8f606344
commit b13b9438b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/scripts/contentscript.js
View File

@ -485,9 +485,11 @@ const onMessageSetUpExtensionStreams = (msg) => {
/** /**
* This listener destroys the extension streams when the extension port is disconnected, * This listener destroys the extension streams when the extension port is disconnected,
* so that streams may be re-established later when the extension port is reconnected. * so that streams may be re-established later when the extension port is reconnected.
*
* @param {Error} [err] - Stream connection error
*/ */
const onDisconnectDestroyStreams = () => { const onDisconnectDestroyStreams = (err) => {
const err = checkForLastError(); const lastErr = err || checkForLastError();
extensionPort.onDisconnect.removeListener(onDisconnectDestroyStreams); extensionPort.onDisconnect.removeListener(onDisconnectDestroyStreams);
@ -501,8 +503,8 @@ const onDisconnectDestroyStreams = () => {
* may cause issues. We suspect that this is a chromium bug as this event should only be called * may cause issues. We suspect that this is a chromium bug as this event should only be called
* once the port and connections are ready. Delay time is arbitrary. * once the port and connections are ready. Delay time is arbitrary.
*/ */
if (err) { if (lastErr) {
console.warn(`${err} Resetting the streams.`); console.warn(`${lastErr} Resetting the streams.`);
setTimeout(setupExtensionStreams, 1000); setTimeout(setupExtensionStreams, 1000);
} }
}; };
@ -630,6 +632,18 @@ const start = () => {
injectScript(inpageBundle); injectScript(inpageBundle);
} }
initStreams(); initStreams();
// https://bugs.chromium.org/p/chromium/issues/detail?id=1457040
// Temporary workaround for chromium bug that breaks the content script <=> background connection
// for prerendered pages. This resets potentially broken extension streams if a page transitions
// from the prerendered state to the active state.
if (document.prerendering) {
document.addEventListener('prerenderingchange', () => {
onDisconnectDestroyStreams(
new Error('Prerendered page has become active.'),
);
});
}
} }
}; };