Merge branch 'main' into autofill_trigger

Author: sadym-chromium

.browser

@@ -1 +1 @@
-chrome@141.0.7381.0
+chrome@142.0.7397.0

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "8.0.0"
+  ".": "8.1.0"
 }

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [8.1.0](https://github.com/GoogleChromeLabs/chromium-bidi/compare/chromium-bidi-v8.0.0...chromium-bidi-v8.1.0) (2025-09-03)
+
+
+### Features
+
+* do not dispose request until all the collectors are gone ([#3669](https://github.com/GoogleChromeLabs/chromium-bidi/issues/3669)) ([909176c](https://github.com/GoogleChromeLabs/chromium-bidi/commit/909176cb4bbc763524ae8efb6458ed005f5a9487))
+
+
+### Bug Fixes
+
+* support network.getData on OOPiF ([#3674](https://github.com/GoogleChromeLabs/chromium-bidi/issues/3674)) ([403dc7c](https://github.com/GoogleChromeLabs/chromium-bidi/commit/403dc7cacf59aecede1e68e6fae61b6edeaacdaa))
+
 ## [8.0.0](https://github.com/GoogleChromeLabs/chromium-bidi/compare/chromium-bidi-v7.3.2...chromium-bidi-v8.0.0) (2025-08-13)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "chromium-bidi",
-  "version": "8.0.0",
+  "version": "8.1.0",
   "description": "An implementation of the WebDriver BiDi protocol for Chromium implemented as a JavaScript layer translating between BiDi and CDP, running inside a Chrome tab.",
   "scripts": {
     "build": "wireit",
@@ -197,7 +197,7 @@
     "chai": "4.5.0",
     "chai-as-promised": "7.1.2",
     "debug": "4.4.1",
-    "devtools-protocol": "0.0.1507524",
+    "devtools-protocol": "0.0.1511308",
     "eslint": "9.31.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-import-resolver-typescript": "4.4.4",

package.json

@@ -201,67 +201,59 @@ export class CdpTarget {
    * Enables all the required CDP domains and unblocks the target.
    */
   async #unblock() {
-    try {
-      await Promise.all([
-        this.#cdpClient.sendCommand('Page.enable', {
-          enableFileChooserOpenedEvent: true,
-        }),
-        ...(this.#ignoreFileDialog()
-          ? []
-          : [
-              this.#cdpClient.sendCommand(
-                'Page.setInterceptFileChooserDialog',
-                {
-                  enabled: true,
-                  // The intercepted dialog should be canceled.
-                  cancel: true,
-                },
-              ),
-            ]),
-        // There can be some existing frames in the target, if reconnecting to an
-        // existing browser instance, e.g. via Puppeteer. Need to restore the browsing
-        // contexts for the frames to correctly handle further events, like
-        // `Runtime.executionContextCreated`.
-        // It's important to schedule this task together with enabling domains commands to
-        // prepare the tree before the events (e.g. Runtime.executionContextCreated) start
-        // coming.
-        // https://github.com/GoogleChromeLabs/chromium-bidi/issues/2282
-        this.#cdpClient
-          .sendCommand('Page.getFrameTree')
-          .then((frameTree) =>
-            this.#restoreFrameTreeState(frameTree.frameTree),
-          ),
-        this.#cdpClient.sendCommand('Runtime.enable'),
-        this.#cdpClient.sendCommand('Page.setLifecycleEventsEnabled', {
-          enabled: true,
-        }),
-        // Enabling CDP Network domain is required for navigation detection:
-        // https://github.com/GoogleChromeLabs/chromium-bidi/issues/2856.
-        this.#cdpClient
-          .sendCommand('Network.enable')
-          .then(() => this.toggleNetworkIfNeeded()),
-        this.#cdpClient.sendCommand('Target.setAutoAttach', {
-          autoAttach: true,
-          waitForDebuggerOnStart: true,
-          flatten: true,
-        }),
-        this.#updateWindowId(),
-        this.#setUserContextConfig(),
-        this.#initAndEvaluatePreloadScripts(),
-        this.#cdpClient.sendCommand('Runtime.runIfWaitingForDebugger'),
-        // Resume tab execution as well if it was paused by the debugger.
-        this.#parentCdpClient.sendCommand('Runtime.runIfWaitingForDebugger'),
-        this.toggleDeviceAccessIfNeeded(),
-      ]);
-    } catch (error: any) {
-      this.#logger?.(LogType.debugError, 'Failed to unblock target', error);
-      // The target might have been closed before the initialization finished.
-      if (!this.#cdpClient.isCloseError(error)) {
-        this.#unblocked.resolve({
-          kind: 'error',
-          error,
-        });
-        return;
+    const results = await Promise.allSettled([
+      this.#cdpClient.sendCommand('Page.enable', {
+        enableFileChooserOpenedEvent: true,
+      }),
+      ...(this.#ignoreFileDialog()
+        ? []
+        : [
+            this.#cdpClient.sendCommand('Page.setInterceptFileChooserDialog', {
+              enabled: true,
+              // The intercepted dialog should be canceled.
+              cancel: true,
+            }),
+          ]),
+      // There can be some existing frames in the target, if reconnecting to an
+      // existing browser instance, e.g. via Puppeteer. Need to restore the browsing
+      // contexts for the frames to correctly handle further events, like
+      // `Runtime.executionContextCreated`.
+      // It's important to schedule this task together with enabling domains commands to
+      // prepare the tree before the events (e.g. Runtime.executionContextCreated) start
+      // coming.
+      // https://github.com/GoogleChromeLabs/chromium-bidi/issues/2282
+      this.#cdpClient
+        .sendCommand('Page.getFrameTree')
+        .then((frameTree) => this.#restoreFrameTreeState(frameTree.frameTree)),
+      this.#cdpClient.sendCommand('Runtime.enable'),
+      this.#cdpClient.sendCommand('Page.setLifecycleEventsEnabled', {
+        enabled: true,
+      }),
+      // Enabling CDP Network domain is required for navigation detection:
+      // https://github.com/GoogleChromeLabs/chromium-bidi/issues/2856.
+      this.#cdpClient
+        .sendCommand('Network.enable')
+        .then(() => this.toggleNetworkIfNeeded()),
+      this.#cdpClient.sendCommand('Target.setAutoAttach', {
+        autoAttach: true,
+        waitForDebuggerOnStart: true,
+        flatten: true,
+      }),
+      this.#updateWindowId(),
+      this.#setUserContextConfig(),
+      this.#initAndEvaluatePreloadScripts(),
+      this.#cdpClient.sendCommand('Runtime.runIfWaitingForDebugger'),
+      // Resume tab execution as well if it was paused by the debugger.
+      this.#parentCdpClient.sendCommand('Runtime.runIfWaitingForDebugger'),
+      this.toggleDeviceAccessIfNeeded(),
+    ]);
+    for (const result of results) {
+      if (result instanceof Error) {
+        this.#logger?.(
+          LogType.debugError,
+          'Error happened when configuring a new target',
+          result,
+        );
       }
     }
 

src/bidiMapper/modules/cdp/CdpTarget.ts

@@ -263,6 +263,7 @@ export class CdpTargetManager {
       case 'worker': {
         const realm = this.#realmStorage.findRealm({
           cdpSessionId: parentSessionCdpClient.sessionId,
+          sandbox: null, // Non-sandboxed realms.
         });
         // If there is no browsing context, this worker is already terminated.
         if (!realm) {

src/bidiMapper/modules/cdp/CdpTargetManager.ts

@@ -908,17 +908,13 @@ export class NetworkRequest {
       this.#response.extraInfo = undefined;
     }
 
-    const headers = [
-      ...bidiNetworkHeadersFromCdpNetworkHeaders(this.#response.info?.headers),
-      ...bidiNetworkHeadersFromCdpNetworkHeaders(
-        this.#response.extraInfo?.headers,
-      ),
-      // TODO: Verify how to dedupe these
-      // ...bidiNetworkHeadersFromCdpNetworkHeadersEntries(
-      //   this.#response.paused?.responseHeaders
-      // ),
-    ];
-
+    // TODO: Also this.#response.paused?.responseHeaders have to be merged here.
+    const cdpHeaders = this.#response.info?.headers ?? {};
+    const cdpRawHeaders = this.#response.extraInfo?.headers ?? {};
+    for (const [key, value] of Object.entries(cdpRawHeaders)) {
+      cdpHeaders[key] = value;
+    }
+    const headers = bidiNetworkHeadersFromCdpNetworkHeaders(cdpHeaders);
     const authChallenges = this.#authChallenges;
 
     const response: Network.ResponseData = {

src/bidiMapper/modules/network/NetworkRequest.ts

@@ -31,7 +31,8 @@ interface RealmFilter {
   executionContextId?: Protocol.Runtime.ExecutionContextId;
   origin?: string;
   type?: Script.RealmType;
-  sandbox?: string;
+  // null indicates no sandbox.
+  sandbox?: string | null;
   cdpSessionId?: Protocol.Target.SessionID;
   isHidden?: boolean;
 }
@@ -59,6 +60,8 @@ export class RealmStorage {
 
   /** Finds all realms that match the given filter. */
   findRealms(filter: RealmFilter): Realm[] {
+    const sandboxFilterValue =
+      filter.sandbox === null ? undefined : filter.sandbox;
     return Array.from(this.#realmMap.values()).filter((realm) => {
       if (filter.realmId !== undefined && filter.realmId !== realm.realmId) {
         return false;
@@ -73,7 +76,8 @@ export class RealmStorage {
       }
       if (
         filter.sandbox !== undefined &&
-        (!(realm instanceof WindowRealm) || filter.sandbox !== realm.sandbox)
+        (!(realm instanceof WindowRealm) ||
+          sandboxFilterValue !== realm.sandbox)
       ) {
         return false;
       }
@@ -106,11 +110,7 @@ export class RealmStorage {
   }
 
   findRealm(filter: RealmFilter): Realm | undefined {
-    const maybeRealms = this.findRealms(filter);
-    if (maybeRealms.length !== 1) {
-      return undefined;
-    }
-    return maybeRealms[0];
+    return this.findRealms(filter)[0];
   }
 
   /** Gets the only realm that matches the given filter, if any, otherwise throws. */