Register listeners ASAP to make Manifest V3 friendly

piroor · Jan 22, 2024 · f4b2477 · f4b2477
1 parent fb58623
commit f4b2477
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/webextensions/background/background.js b/webextensions/background/background.js
@@ -74,6 +74,7 @@ async function getAllWindows() {
 
 log('init: Start queuing of messages notified via WE APIs');
 ApiTabsListener.init();
+const promisedRestored = waitUntilCompletelyRestored(); // this must be called synchronosly
 
 export async function init() {
   log('init: start');
@@ -101,7 +102,7 @@ export async function init() {
   let promisedWindows;
   log('init: Getting existing windows and tabs');
   await MetricsData.addAsync('init: waiting for waitUntilCompletelyRestored, ContextualIdentities.init and configs.$loaded', Promise.all([
-    waitUntilCompletelyRestored().then(() => {
+    promisedRestored.then(() => {
       // don't wait at here for better performance
       promisedWindows = getAllWindows();
     }),

diff --git a/webextensions/background/handle-misc.js b/webextensions/background/handle-misc.js
@@ -50,9 +50,15 @@ let mInitialized = false;
 // unneeded cases.
 // See also: https://github.com/piroor/treestyletab/issues/2200
 
-Background.onInit.addListener(() => {
-  (browser.action || browser.browserAction).onClicked.addListener(onToolbarButtonClick);
+if (browser.action) { // Manifest V3
+  browser.action.onClicked.addListener(onToolbarButtonClick);
   browser.commands.onCommand.addListener(onShortcutCommand);
+}
+Background.onInit.addListener(() => {
+  if (browser.browserAction) { // Manifest V2
+    browser.browserAction.onClicked.addListener(onToolbarButtonClick);
+    browser.commands.onCommand.addListener(onShortcutCommand);
+  }
   TSTAPI.onMessageExternal.addListener(onMessageExternal);
 });