Register listeners at top level for Manifest V3

piroor · Jan 24, 2024 · b1b5c50 · b1b5c50
1 parent 0dbea1f
commit b1b5c50
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/webextensions/common/sync.js b/webextensions/common/sync.js
@@ -95,6 +95,25 @@ function onConfigChanged(key, value = undefined) {
   }
 }
 
+browser.runtime.onMessageExternal.addListener((message, sender) => {
+  if (!initialized ||
+      !message ||
+      typeof message != 'object' ||
+      typeof message.type != 'string' ||
+      sender.id != SEND_TABS_SIMULATOR_ID)
+    return;
+
+  switch (message.type) {
+    case 'ready':
+      browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'register-self' });
+    case 'device-added':
+    case 'device-updated':
+    case 'device-removed':
+      updateSelf();
+      break;
+  }
+});
+
 export async function init() {
   configs.$addObserver(onConfigChanged); // we need to register the listener to collect pre-sent changes
   await configs.$loaded;
@@ -111,23 +130,6 @@ export async function init() {
   preChanges = [];
 
   browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'register-self' });
-  browser.runtime.onMessageExternal.addListener((message, sender) => {
-    if (!message ||
-        typeof message != 'object' ||
-        typeof message.type != 'string' ||
-        sender.id != SEND_TABS_SIMULATOR_ID)
-      return;
-
-    switch (message.type) {
-      case 'ready':
-        browser.runtime.sendMessage(SEND_TABS_SIMULATOR_ID, { type: 'register-self' });
-      case 'device-added':
-      case 'device-updated':
-      case 'device-removed':
-        updateSelf();
-        break;
-    }
-  });
 }
 
 export async function generateDeviceInfo({ name, icon } = {}) {