Partially bring suspendTabsUntilReady out of experimental status

This commit will force-reload active tabs at launch for environments not supporting suspend network request listeners, or configured to not suspend network request listeners.
gorhill · Dec 18, 2021 · a0a9497 · gwarser · Dec 24, 2021 · gorhill
1 parent edab87b
commit a0a9497
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/js/start.js b/src/js/start.js
@@ -304,7 +304,7 @@ const onHiddenSettingsReady = async function() {
         });
     }
 
-    // Matbe override default cache storage
+    // Maybe override default cache storage
     const cacheBackend = await cacheStorage.select(
         µb.hiddenSettings.cacheStorageAPI
     );

diff --git a/src/js/traffic.js b/src/js/traffic.js
@@ -1138,15 +1138,29 @@ const webRequest = {
         vAPI.net = new vAPI.Net();
         vAPI.net.suspend();
 
-        return ( ) => {
+        return async ( ) => {
             vAPI.net.setSuspendableListener(onBeforeRequest);
             vAPI.net.addListener(
                 'onHeadersReceived',
                 onHeadersReceived,
                 { urls: [ 'http://*/*', 'https://*/*' ] },
                 [ 'blocking', 'responseHeaders' ]
             );
-            vAPI.net.unsuspend(true);
+            vAPI.net.unsuspend({ force: true });
+            // Mitigation: force-reload active tabs for environments not
+            // supporting suspended network request listeners.
+            if (
+                vAPI.net.canSuspend() !== true ||
+                µb.hiddenSettings.suspendTabsUntilReady === 'no'
+            ) {
+                const tabs = await vAPI.tabs.query({
+                    active: true,
+                    windowType: 'normal',
+                });
+                for ( const tab of tabs ) {
+                    vAPI.tabs.reload(tab.id);
+                }
+            }
         };
     })(),
	suspend(force = false) {
	if ( this.canSuspend() \|\| force ) {
	this.suspendDepth += 1;
	}
	browser.webRequest.onBeforeRequest.addListener(
	details => {
	this.normalizeDetails(details);
	if ( this.suspendDepth !== 0 && details.tabId >= 0 ) {
	return this.suspendOneRequest(details);
	}