Track frames

Author: fregante

source/active-tab.ts

@@ -11,15 +11,15 @@ export type ActiveTab = {
 
 export const possiblyActiveTabs = new Map<TabId, Origin>();
 
-const emitter = new SimpleEventTarget<ActiveTab>();
+const newActiveTabs = new SimpleEventTarget<ActiveTab>();
 
 const browserAction = chrome.action ?? chrome.browserAction;
 
 function listener({url, id}: chrome.tabs.Tab): void {
-	if (id && url && isScriptableUrl(url)) {
+	if (id && url &&!possiblyActiveTabs.has(id) && isScriptableUrl(url)) {
 		const {origin} = new URL(url);
 		possiblyActiveTabs.set(id, origin);
-		emitter.emit({id, origin});
+		newActiveTabs.emit({id, origin});
 	}
 }
 
@@ -45,9 +45,10 @@ export function stopActiveTabTracking() {
 	chrome.contextMenus?.onClicked.removeListener(altListener);
 	chrome.commands?.onCommand.removeListener(altListener);
 	chrome.tabs.onRemoved.removeListener(removalListener);
+	possiblyActiveTabs.clear();
 }
 
 export function onActiveTab(callback: (tab: ActiveTab) => void) {
 	startActiveTabTracking();
-	emitter.add(callback);
+	newActiveTabs.add(callback);
 }

source/including-active-tab.ts

@@ -2,12 +2,20 @@
 import '.';
 import {type ContentScript} from 'webext-content-scripts/types';
 import {injectContentScript} from 'webext-content-scripts';
-import {type ActiveTab, onActiveTab} from './active-tab.js';
+import {type ActiveTab, onActiveTab, possiblyActiveTabs} from './active-tab.js';
 import {isContentScriptRegistered} from './utils.js';
 
+type InjectionDetails = {
+	tabId: number;
+	frameId: number;
+	url: string;
+};
+
+const gotNavigation = typeof chrome === 'object' && 'webNavigation' in chrome;
+
 const scripts = chrome.runtime.getManifest().content_scripts as ContentScript;
 
-async function injectToTab({id, origin}: ActiveTab): Promise<void> {
+async function injectToTabUnlessRegistered({id, origin}: ActiveTab): Promise<void> {
 	if (id && !(await isContentScriptRegistered(origin))) {
 		// Warning: This might cause duplicate injections on frames of activeTabs with different origins. Some details in:
 		// https://github.com/fregante/webext-dynamic-content-scripts/pull/44
@@ -16,4 +24,34 @@ async function injectToTab({id, origin}: ActiveTab): Promise<void> {
 	}
 }
 
-onActiveTab(injectToTab);
+async function injectIfActive(
+	{tabId, frameId, url}: InjectionDetails,
+): Promise<void> {
+	if (possiblyActiveTabs.has(tabId) && !(await isContentScriptRegistered(url))) {
+		await injectContentScript({tabId, frameId}, scripts);
+	}
+}
+
+async function tabListener(
+	tabId: number,
+	{status}: chrome.tabs.TabChangeInfo,
+	{url}: chrome.tabs.Tab,
+): Promise<void> {
+	// Only status updates are relevant
+	// No URL = no permission
+	if (status === 'loading' && url) {
+		await injectIfActive({tabId, url, frameId: 0});
+	}
+}
+
+function init() {
+	onActiveTab(injectToTabUnlessRegistered);
+
+	if (gotNavigation) {
+		chrome.webNavigation.onCommitted.addListener(injectIfActive);
+	} else {
+		chrome.tabs.onUpdated.addListener(tabListener);
+	}
+}
+
+init();