revert a89548a for broadcasts + use BroadcastChannel

Author: tophf

src/background/broadcast.js

@@ -1,7 +1,6 @@
 import '@/js/browser';
 import {kTabOvr, pExposeIframes, pStyleViaASS} from '@/js/consts';
 import {rxIgnorableError} from '@/js/msg-api';
-import {ownRoot} from '@/js/urls';
 import {sleep0} from '@/js/util';
 import {isOptionSite, optionSites} from './option-sites';
 import {tabCache} from './tab-manager';
@@ -11,6 +10,7 @@ let toBroadcast;
 let toBroadcastCfg;
 let toBroadcastUpdStyles;
 const OLD = Symbol('old');
+const channel = new BroadcastChannel('sw');
 
 export function broadcast(data, cfg) {
   toBroadcast ??= (setTimeout(doBroadcast), []);
@@ -49,22 +49,24 @@ async function doBroadcast() {
     const tabOverrides = tabCache[t.id]?.[kTabOvr];
     const patched = tabOverrides && Object.keys(tabOverrides).length &&
       patchStyles(updStyles, tabOverrides);
-    if (!url.startsWith(ownRoot) || patched) {
-      if (assSites) cfg.ass = isOptionSite(assSites, url);
-      if (iframeSites) cfg.top = isOptionSite(iframeSites, url);
-      sendTab(t.id, data, null, true);
-      if (patched) for (const p of patched) p.enabled = p[OLD];
-      /* Broadcast messages are tiny, but sending them takes some time anyway,
-         so we're yielding for a possible navigation/messaging event. */
-      if (++cnt > 50) {
-        cnt = 0;
-        await sleep0();
-      }
+    if (assSites) cfg.ass = isOptionSite(assSites, url);
+    if (iframeSites) cfg.top = isOptionSite(iframeSites, url);
+    sendTab(t.id, data, null, true);
+    if (patched) for (const p of patched) p.enabled = p[OLD];
+    /* Broadcast messages are tiny, but sending them takes some time anyway,
+       so we're yielding for a possible navigation/messaging event. */
+    if (++cnt > 50) {
+      cnt = 0;
+      await sleep0();
     }
   }
 }
 
 export function broadcastExtension(data, multi) {
+  if (__.MV3) {
+    channel.postMessage({id: 1, args: [data, {}, multi, /*broadcast*/true]});
+    return;
+  }
   return unwrap(browser.runtime.sendMessage({data, multi, broadcast: true}));
 }
 

src/js/msg-init.js

@@ -1,8 +1,9 @@
 /** Don't use this file in content script context! */
 import './browser';
 import {k_busy, k_deepCopy, k_msgExec, kInvokeAPI} from '@/js/consts';
+import {_execute} from './msg';
 import {apiHandler, apiSendProxy, isPopup} from './msg-api';
-import {createPortExec, createPortProxy} from './port';
+import {createPortExec, createPortProxy, initRemotePort} from './port';
 import {swPath, workerPath} from './urls';
 import {deepCopy} from './util';
 import {getOwnTab, ownTab} from './util-webext';
@@ -20,6 +21,9 @@ const swExec = __.MV3 &&
 const workerApiPrefix = 'worker.';
 let workerProxy;
 export let bg = __.IS_BG ? self : !__.MV3 && chrome.extension.getBackgroundPage();
+if (!__.IS_BG) {
+  initRemotePort.call(_execute, {ports: [new BroadcastChannel('sw')]}, /*silent*/true);
+}
 
 async function invokeAPI({name: path}, _thisObj, args) {
   // Non-cloneable event is passed when doing `elem.onclick = API.foo`

src/js/msg.js

@@ -59,10 +59,12 @@ function onRuntimeMessage({data, multi, TDM, broadcast}, sender, sendResponse) {
     return;
   }
   sender.TDM = TDM;
-  let res = __.IS_BG && global[k_busy];
-  res = res
+  let res;
+  res = __.IS_BG && (res = global[k_busy])
     ? res.then(_execute.bind(null, data, sender, multi, broadcast))
     : _execute(data, sender, multi, broadcast);
+  if (broadcast)
+    return;
   if (res instanceof Promise) {
     res.then(wrapData, wrapError).then(sendResponse);
     return true;

src/js/port.js

@@ -165,8 +165,9 @@ export function createPortExec(getTarget, {lock, once} = {}, target) {
 /**
  * @this {Function | {}} executor
  * @param {MessageEvent} evt
+ * @param {boolean} [silent]
  */
-export function initRemotePort(evt) {
+export function initRemotePort(evt, silent) {
   const {id: once} = evt.data || {};
   const exec = this;
   const port = evt.ports[0];
@@ -198,7 +199,7 @@ export function initRemotePort(evt) {
       }
     }
     __.DEBUGPORT('%c%s port response', 'color:blue', PATH, id, {res, err});
-    port.postMessage({id, res, err}, portEvent._transfer);
+    if (!silent) port.postMessage({id, res, err}, portEvent._transfer);
     if (!--numJobs && willAutoClose && !bgLock) {
       autoClose(TTL);
     }