extension 3.15.0 → 3.15.1

package/dist/322.cjs

@@ -1334,13 +1334,18 @@ exports.modules = {
                         if (!sessionId) return;
                         const session = this.watchedPageSessions.get(sessionId);
                         if (!session) return;
+                        if (this.suppressInitialContextBurst.has(sessionId)) return;
                         const context = params?.context;
                         if (!context) return;
                         this.evaluateContentScriptOnNewContext(sessionId, session, context).catch(()=>{});
                         return;
                     }
                     if ('Target.detachedFromTarget' === method) {
-                        if (sessionId) this.watchedPageSessions.delete(sessionId);
+                        if (sessionId) {
+                            this.watchedPageSessions.delete(sessionId);
+                            this.releaseSessionContexts(sessionId);
+                            this.suppressInitialContextBurst.delete(sessionId);
+                        }
                     }
                 });
             }
@@ -1366,10 +1371,15 @@ exports.modules = {
                     targetId,
                     url
                 });
+                this.suppressInitialContextBurst.add(sessionId);
                 try {
                     await this.cdp.sendCommand('Runtime.enable', {}, sessionId);
+                    setTimeout(()=>{
+                        this.suppressInitialContextBurst.delete(sessionId);
+                    }, 250);
                 } catch  {
                     this.watchedPageSessions.delete(sessionId);
+                    this.suppressInitialContextBurst.delete(sessionId);
                 }
             }
             async evaluateContentScriptOnNewContext(sessionId, session, context) {
@@ -1792,9 +1802,15 @@ exports.modules = {
     if (existing && typeof existing.cleanup === 'function') existing.cleanup();
   } catch (error) {}
   if (${allowCoarseCleanup ? 'true' : 'false'}) {
+    // Bundle-scoped sweep: only remove roots owned by this bundleId. The inner
+    // wrapper tags every host with data-extjs-reinject-key on mount, so this
+    // catches roots from a manifest-cached run before the outer cleanup
+    // registry was populated. A broad querySelector('[data-extension-root]')
+    // would destroy roots owned by sibling content_scripts entries that
+    // didn't change — leaving the page with only this bundle's roots.
     try {
-      const staleRoots = Array.from(document.querySelectorAll(rootSelector));
-      for (const root of staleRoots) {
+      const staleKeyed = Array.from(document.querySelectorAll(keyedSelector));
+      for (const root of staleKeyed) {
         if (root && typeof root.remove === 'function') root.remove();
       }
     } catch (error) {}
@@ -1945,22 +1961,39 @@ exports.modules = {
             }
             async collectExecutionContexts(sessionId) {
                 if (!this.cdp) return [];
+                const cached = this.sessionContexts.get(sessionId);
+                if (cached) return Array.from(cached.values());
                 const contextsById = new Map();
+                this.sessionContexts.set(sessionId, contextsById);
                 const unsubscribe = this.cdp.onProtocolEvent((message)=>{
                     if (String(message.sessionId || '') !== sessionId) return;
-                    if ('Runtime.executionContextCreated' !== String(message.method || '')) return;
-                    const context = message.params?.context;
-                    const contextId = context?.id;
-                    if ('number' == typeof contextId) contextsById.set(contextId, context);
+                    const method = String(message.method || '');
+                    if ('Runtime.executionContextCreated' === method) {
+                        const context = message.params?.context;
+                        const contextId = context?.id;
+                        if ('number' == typeof contextId) contextsById.set(contextId, context);
+                        return;
+                    }
+                    if ('Runtime.executionContextDestroyed' === method) {
+                        const params = message.params || {};
+                        if ('number' == typeof params.executionContextId) contextsById.delete(params.executionContextId);
+                        return;
+                    }
+                    if ('Runtime.executionContextsCleared' === method) contextsById.clear();
                 });
-                try {
-                    await this.cdp.sendCommand('Runtime.enable', {}, sessionId);
-                    await new Promise((resolve)=>setTimeout(resolve, 100));
-                } finally{
-                    unsubscribe();
-                }
+                this.sessionContextsUnsubscribe.set(sessionId, unsubscribe);
+                await this.cdp.sendCommand('Runtime.enable', {}, sessionId);
+                await new Promise((resolve)=>setTimeout(resolve, 100));
                 return Array.from(contextsById.values());
             }
+            releaseSessionContexts(sessionId) {
+                const unsubscribe = this.sessionContextsUnsubscribe.get(sessionId);
+                if (unsubscribe) try {
+                    unsubscribe();
+                } catch  {}
+                this.sessionContextsUnsubscribe.delete(sessionId);
+                this.sessionContexts.delete(sessionId);
+            }
             constructor(args){
                 cdp_extension_controller_define_property(this, "outPath", void 0);
                 cdp_extension_controller_define_property(this, "browser", void 0);
@@ -1975,6 +2008,9 @@ exports.modules = {
                 cdp_extension_controller_define_property(this, "activeContentScriptRules", []);
                 cdp_extension_controller_define_property(this, "contentScriptTargetListenerInstalled", false);
                 cdp_extension_controller_define_property(this, "watchedPageSessions", new Map());
+                cdp_extension_controller_define_property(this, "sessionContexts", new Map());
+                cdp_extension_controller_define_property(this, "sessionContextsUnsubscribe", new Map());
+                cdp_extension_controller_define_property(this, "suppressInitialContextBurst", new Set());
                 this.outPath = args.outPath;
                 this.browser = args.browser;
                 this.cdpPort = args.cdpPort;

package/dist/extension/browsers/run-chromium/chromium-source-inspection/cdp-extension-controller/index.d.ts

@@ -20,6 +20,9 @@ export declare class CDPExtensionController {
     private activeContentScriptRules;
     private contentScriptTargetListenerInstalled;
     private watchedPageSessions;
+    private sessionContexts;
+    private sessionContextsUnsubscribe;
+    private suppressInitialContextBurst;
     constructor(args: {
         outPath: string;
         browser: 'chrome' | 'edge' | 'chromium-based';
@@ -86,5 +89,6 @@ export declare class CDPExtensionController {
     private resolveExecutionContextId;
     private getTopFrameId;
     private collectExecutionContexts;
+    private releaseSessionContexts;
 }
 export {};

package/package.json

@@ -38,7 +38,7 @@
     "extension": "./bin/extension.cjs"
   },
   "name": "extension",
-  "version": "3.15.0",
+  "version": "3.15.1",
   "description": "Create cross-browser extensions with no build configuration.",
   "homepage": "https://extension.js.org/",
   "bugs": {
@@ -100,9 +100,9 @@
     "cross-spawn": "^7.0.6",
     "edge-location": "2.2.0",
     "firefox-location2": "3.0.0",
-    "extension-create": "3.15.0",
-    "extension-develop": "3.15.0",
-    "extension-install": "3.15.0",
+    "extension-create": "3.15.1",
+    "extension-develop": "3.15.1",
+    "extension-install": "3.15.1",
     "commander": "^14.0.3",
     "pintor": "0.3.0",
     "semver": "^7.7.3",