Skip to content

DocStartInjection: bound execute() with a deadline to avoid permanent hangs #13

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

Open
kyouhei-horizumi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DocStartInjection: bound execute() with a deadline to avoid permanent hangs #13

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
24 changes: 19 additions & 5 deletions service/DocStartInjection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,24 +175,38 @@ var DocStartInjection = (() => {
const ret = await browser.tabs.executeScript(tabId, args);
return ret[0];
};
// give up on uncancellable timed-out calls to avoid piling them up
const TIMED_OUT = Symbol("DocStartInjection execute timeout");
const EXECUTE_TIMEOUT = 3000;
const withDeadline = (promise, ms) => {
let timer;
const deadline = new Promise(resolve => { timer = setTimeout(() => resolve(TIMED_OUT), ms); });
return Promise.race([promise, deadline]).finally(() => clearTimeout(timer));
};
const TIMEOUT = 3 * 60000 + Date.now();
let checkingFrame;
let isTargetedPage = false;
for (; pending.has(id);) {
attempts++;
try {
// enforce timeout on every attempt
if (Date.now() > TIMEOUT) {
console.log("DocStartInjection timeout!");
break;
}
if (attempts % 1000 === 0) {
const tab = await browser.tabs.get(tabId);
if (request.type == "main_frame" && tab.url != url) {
console.error(`Tab mismatch: ${tab.url} <> ${url} (download-triggered?)`);
break;
}
if (Date.now() > TIMEOUT) {
console.log("DocStartInjection timeout!");
break;
}
}
if (await execute()) {
const result = await withDeadline(execute(), EXECUTE_TIMEOUT);
if (result === TIMED_OUT) {
console.error(`DocStartInjection: executeScript() didn't settle within ${EXECUTE_TIMEOUT}ms at tab ${tabId}, frame ${frameId}, url ${url}. Giving up.`);
break;
}
if (result) {
success = true;
break;
}
Expand Down