open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also handle removed/replaced/errored tabs in injectToAllTabs (#850)

Browse Source
This commit is contained in:
tophf 2020-02-12 17:08:25 +03:00 committed by GitHub
parent 7109d33e4e
commit 0b5115fc8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
background/content-scripts.js
View File

@ -1,4 +1,4 @@
/* global msg queryTabs ignoreChromeError */ /* global msg queryTabs ignoreChromeError URLS */
/* exported contentScripts */ /* exported contentScripts */
'use strict'; 'use strict';
@ -15,6 +15,8 @@ const contentScripts = (() => {
m === ALL_URLS ? m : wildcardAsRegExp(m) m === ALL_URLS ? m : wildcardAsRegExp(m)
)); ));
} }
const busyTabs = new Set();
let busyTabsTimer;
return {injectToTab, injectToAllTabs}; return {injectToTab, injectToAllTabs};
function injectToTab({url, tabId, frameId = null}) { function injectToTab({url, tabId, frameId = null}) {
@ -54,13 +56,12 @@ const contentScripts = (() => {
function injectToAllTabs() { function injectToAllTabs() {
return queryTabs({}).then(tabs => { return queryTabs({}).then(tabs => {
const busyTabs = new Set();
for (const tab of tabs) { for (const tab of tabs) {
// skip unloaded/discarded tabs // skip unloaded/discarded/chrome tabs
if (!tab.width || tab.discarded) continue; if (!tab.width || tab.discarded || !URLS.supported(tab.url)) continue;
// our content scripts may still be pending injection at browser start so it's too early to ping them // our content scripts may still be pending injection at browser start so it's too early to ping them
if (tab.status === 'loading') { if (tab.status === 'loading') {
busyTabs.add(tab.id); trackBusyTab(tab.id, true);
} else { } else {
injectToTab({ injectToTab({
url: tab.url, url: tab.url,
@ -68,15 +69,42 @@ const contentScripts = (() => {
}); });
} }
} }
if (busyTabs.size) { });
chrome.tabs.onUpdated.addListener(function _(tabId, {status}, {url}) { }
if (status === 'complete' && busyTabs.has(tabId)) {
busyTabs.delete(tabId); function toggleBusyTabListeners(state) {
if (!busyTabs.size) chrome.tabs.onUpdated.removeListener(_); const toggle = state ? 'addListener' : 'removeListener';
chrome.webNavigation.onCompleted[toggle](onBusyTabUpdated);
chrome.webNavigation.onErrorOccurred[toggle](onBusyTabUpdated);
chrome.webNavigation.onTabReplaced[toggle](onBusyTabReplaced);
chrome.tabs.onRemoved[toggle](onBusyTabRemoved);
if (state) {
busyTabsTimer = setTimeout(toggleBusyTabListeners, 15e3, false);
} else {
clearTimeout(busyTabsTimer);
}
}
function trackBusyTab(tabId, state) {
busyTabs[state ? 'add' : 'delete'](tabId);
if (state && busyTabs.size === 1) toggleBusyTabListeners(true);
if (!state && !busyTabs.size) toggleBusyTabListeners(false);
}
function onBusyTabUpdated({error, frameId, tabId, url}) {
if (!frameId && busyTabs.has(tabId)) {
trackBusyTab(tabId, false);
if (url && !error) {
injectToTab({tabId, url}); injectToTab({tabId, url});
} }
});
} }
}); }
function onBusyTabReplaced({replacedTabId}) {
trackBusyTab(replacedTabId, false);
}
function onBusyTabRemoved(tabId) {
trackBusyTab(tabId, false);
} }
})(); })();