chore: update chromium-bidi to 0.4.33 (#11284)

packages/puppeteer-core/src/bidi/BidiOverCdp.ts

@@ -59,6 +59,8 @@ export async function connectBidiOverCdp(
   const bidiServer = await BidiMapper.BidiServer.createAndStart(
     transportBiDi,
     cdpConnectionAdapter,
+    // TODO: most likely need a little bit of refactoring
+    cdpConnectionAdapter.browserClient(),
     '',
     undefined,
     bidiServerLogger

packages/puppeteer-core/src/bidi/ExposedFunction.ts

@@ -55,6 +55,8 @@ export class ExposeableFunction<Args extends unknown[], Ret> {
     Map<number, RemotePromiseCallbacks>
   >();
 
+  #preloadScriptId?: Bidi.Script.PreloadScript;
+
   constructor(
     frame: BidiFrame,
     name: string,
@@ -121,17 +123,26 @@ export class ExposeableFunction<Args extends unknown[], Ret> {
       )
     );
 
-    await connection.send('script.addPreloadScript', {
+    const {result} = await connection.send('script.addPreloadScript', {
       functionDeclaration,
       arguments: channelArguments,
+      contexts: [this.#frame.page().mainFrame()._id],
     });
+    this.#preloadScriptId = result.script;
 
-    await connection.send('script.callFunction', {
-      functionDeclaration,
-      arguments: channelArguments,
-      awaitPromise: false,
-      target: this.#frame.mainRealm().realm.target,
-    });
+    await Promise.all(
+      this.#frame
+        .page()
+        .frames()
+        .map(async frame => {
+          return await connection.send('script.callFunction', {
+            functionDeclaration,
+            arguments: channelArguments,
+            awaitPromise: false,
+            target: frame.mainRealm().realm.target,
+          });
+        })
+    );
   }
 
   #handleArgumentsMessage = async (params: Bidi.Script.MessageParameters) => {
@@ -277,4 +288,16 @@ export class ExposeableFunction<Args extends unknown[], Ret> {
     }
     return {callbacks, remoteValue: data};
   }
+
+  [Symbol.dispose](): void {
+    void this[Symbol.asyncDispose]().catch(debugError);
+  }
+
+  async [Symbol.asyncDispose](): Promise<void> {
+    if (this.#preloadScriptId) {
+      await this.#connection.send('script.removePreloadScript', {
+        script: this.#preloadScriptId,
+      });
+    }
+  }
 }

packages/puppeteer-core/src/bidi/Page.ts

@@ -746,7 +746,7 @@ export class BidiPage extends Page {
     const expression = evaluationExpression(pageFunction, ...args);
     const {result} = await this.#connection.send('script.addPreloadScript', {
       functionDeclaration: expression,
-      // TODO: should change spec to accept browsingContext
+      contexts: [this.mainFrame()._id],
     });
 
     return {identifier: result.script};

test/TestExpectations.json

@@ -83,12 +83,6 @@
     "parameters": ["webDriverBiDi"],
     "expectations": ["FAIL"]
   },
-  {
-    "testIdPattern": "[evaluation.spec] Evaluation specs Page.removeScriptToEvaluateOnNewDocument *",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["webDriverBiDi"],
-    "expectations": ["FAIL"]
-  },
   {
     "testIdPattern": "[fixtures.spec] *",
     "platforms": ["darwin", "linux", "win32"],
@@ -599,6 +593,18 @@
     "parameters": ["webDriverBiDi"],
     "expectations": ["PASS"]
   },
+  {
+    "testIdPattern": "[evaluation.spec] Evaluation specs Page.removeScriptToEvaluateOnNewDocument *",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["firefox", "webDriverBiDi"],
+    "expectations": ["FAIL"]
+  },
+  {
+    "testIdPattern": "[evaluation.spec] Evaluation specs Page.removeScriptToEvaluateOnNewDocument *",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["chrome", "webDriverBiDi"],
+    "expectations": ["PASS"]
+  },
   {
     "testIdPattern": "[evaluation.spec] Evaluation specs Page.removeScriptToEvaluateOnNewDocument *",
     "platforms": ["darwin", "linux", "win32"],
@@ -2609,12 +2615,6 @@
     "parameters": ["cdp", "firefox"],
     "expectations": ["FAIL"]
   },
-  {
-    "testIdPattern": "[network.spec] network Network Events should support redirects",
-    "platforms": ["win32"],
-    "parameters": ["cdp", "chrome"],
-    "expectations": ["FAIL", "PASS"]
-  },
   {
     "testIdPattern": "[network.spec] network Page.authenticate should allow disable authentication",
     "platforms": ["darwin", "linux", "win32"],
@@ -2765,6 +2765,12 @@
     "parameters": ["firefox", "webDriverBiDi"],
     "expectations": ["FAIL", "PASS"]
   },
+  {
+    "testIdPattern": "[network.spec] network Response.fromCache should work",
+    "platforms": ["darwin", "linux", "win32"],
+    "parameters": ["chrome", "webDriverBiDi"],
+    "expectations": ["FAIL"]
+  },
   {
     "testIdPattern": "[network.spec] network Response.fromServiceWorker Response.fromServiceWorker",
     "platforms": ["darwin", "linux", "win32"],
@@ -2831,12 +2837,6 @@
     "parameters": ["chrome", "webDriverBiDi"],
     "expectations": ["PASS"]
   },
-  {
-    "testIdPattern": "[oopif.spec] OOPIF should provide access to elements",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["chrome", "webDriverBiDi"],
-    "expectations": ["PASS"]
-  },
   {
     "testIdPattern": "[oopif.spec] OOPIF should support evaluating in oop iframes",
     "platforms": ["darwin", "linux", "win32"],