more reliable urlChange

Author: tophf

src/background/icon-manager.js

@@ -67,13 +67,15 @@ onUnload.add((tabId, frameId, port) => {
 /**
  * @param {(number|string)[]} styleIds
  * @param {boolean} [lazyBadge] preventing flicker during page load
+ * @param {number} [iid] instance id
  */
-export function updateIconBadge(styleIds, lazyBadge) {
+export function updateIconBadge(styleIds, lazyBadge, iid) {
   // FIXME: in some cases, we only have to redraw the badge. is it worth a optimization?
   const {tab: {id: tabId}, TDM} = this.sender;
   const frameId = TDM > 0 ? 0 : this.sender.frameId;
   const value = styleIds.length ? styleIds.map(Number) : undefined;
   tabMan.set(tabId, kStyleIds, frameId, value);
+  if (iid) tabMan.set(tabId, 'iid', frameId, value && iid);
   debounce(refreshStaleBadges, frameId && lazyBadge ? 250 : 0);
   staleBadges.add(tabId);
   if (!frameId) refreshIcon(tabId, true);

src/background/navigation-manager.js

@@ -49,12 +49,18 @@ async function onNavigation(navType, data) {
   const {tabId} = data;
   const td = tabCache[tabId];
   if (td && navType !== kCommitted) {
-    const {frameId: f, documentId: d, frameType, url} = data;
-    const isTop = !frameType && !f || frameType === 'outer_frame';
-    const oldUrl = td[kUrl]?.[f];
-    if (oldUrl !== url)
-      sendTab(tabId, {method: 'urlChanged', top: isTop, old: oldUrl, url},
-        __.MV3 || d ? {documentId: d} : {frameId: f});
+    const {frameId: f, url} = data;
+    if (td[kUrl]?.[f] !== url) {
+      const {documentId: d, frameType} = data;
+      sendTab(tabId, {
+        method: 'urlChanged',
+        top: !frameType && !f || frameType === 'outer_frame',
+        iid: !__.MV3 && td.iid?.[f] || 0,
+        url,
+      }, __.MV3 || d
+        ? {documentId: d}
+        : {frameId: f});
+    }
   }
   for (const fn of onUrlChange) fn(data, navType);
 }

src/content/apply.js

@@ -21,7 +21,7 @@ if (isFrame) {
 const isFrameNoUrl = isFrameSameOrigin && location.protocol === 'about:';
 
 /** Polyfill for documentId in Firefox and Chrome pre-106 */
-const instanceId = (FF || !__.MV3 && !CSS.supports('top', '1ic')) && Math.random() || undefined;
+const instanceId = (FF || !__.MV3 && !CSS.supports('top', '1ic')) && Math.random() || 0;
 /** about:blank iframes are often used by sites for file upload or background tasks,
  * and they may break if unexpected DOM stuff is present at `load` event
  * so we'll add the styles only if the iframe becomes visible */
@@ -163,7 +163,7 @@ function applyOnMessage(req, sender, multi) {
       break;
 
     case 'urlChanged':
-      if (matchUrl === req.old)
+      if (req.iid === instanceId)
         updateUrl(req.url);
       break;
 
@@ -227,7 +227,7 @@ function updateCount() {
   if (isUnstylable) API.styleViaAPI({method: 'updateCount'});
   else if (!throttled
   && throttledCount !== (str = (ids = [...styleInjector.table.keys()]).join(','))) {
-    API.updateIconBadge(ids, lazyBadge);
+    API.updateIconBadge(ids, lazyBadge, instanceId);
     throttledCount = str;
   }
 }