chore(bidi): fix intercepts for context.route()

Author: hbenl

packages/playwright-core/src/server/bidi/bidiBrowser.ts

@@ -191,6 +191,7 @@ export class BidiBrowserContext extends BrowserContext {
   declare readonly _browser: BidiBrowser;
   private _originToPermissions = new Map<string, string[]>();
   private _initScriptIds = new Map<InitScript, string>();
+  private _interceptIdPromise: Promise<bidi.Network.Intercept> | undefined;
 
   constructor(browser: BidiBrowser, browserContextId: string | undefined, options: types.BrowserContextOptions) {
     super(browser, options, browserContextId);
@@ -373,6 +374,19 @@ export class BidiBrowserContext extends BrowserContext {
   }
 
   async doUpdateRequestInterception(): Promise<void> {
+    if (this.requestInterceptors.length > 0 && !this._interceptIdPromise) {
+      this._interceptIdPromise = this._browser._browserSession.send('network.addIntercept', {
+        phases: [bidi.Network.InterceptPhase.BeforeRequestSent],
+        urlPatterns: [{ type: 'pattern' }],
+      }).then(({ intercept }) => intercept);
+    }
+    if (this.requestInterceptors.length === 0 && this._interceptIdPromise) {
+      const interceptIdPromise = this._interceptIdPromise;
+      this._interceptIdPromise = undefined;
+      await this._browser._browserSession.send('network.removeIntercept', {
+        intercept: await interceptIdPromise
+      });
+    }
   }
 
   override async doUpdateDefaultViewport() {

packages/playwright-core/src/server/bidi/bidiPage.ts

@@ -95,7 +95,6 @@ export class BidiPage implements PageDelegate {
     this._onFrameAttached(this._session.sessionId, null);
     await Promise.all([
       this.updateHttpCredentials(),
-      this.updateRequestInterception(),
       // If the page is created by the Playwright client's call, some initialization
       // may be pending. Wait for it to complete before reporting the page as new.
     ]);
@@ -345,7 +344,7 @@ export class BidiPage implements PageDelegate {
   }
 
   async updateRequestInterception(): Promise<void> {
-    await this._networkManager.setRequestInterception(this._page.needsRequestInterception());
+    await this._networkManager.setRequestInterception(this._page.requestInterceptors.length > 0);
   }
 
   async updateOffline() {

tests/bidi/expectations/bidi-chromium-library.txt

@@ -202,9 +202,6 @@ library/slowmo.spec.ts › slowMo › Page SlowMo setInputFiles [timeout]
 library/snapshotter.spec.ts › snapshots › should capture snapshot target [timeout]
 library/trace-viewer.spec.ts › should serve css without content-type [timeout]
 library/tracing.spec.ts › should collect trace with resources, but no js [timeout]
-library/unroute-behavior.spec.ts › context.unroute should not wait for pending handlers to complete [timeout]
-library/unroute-behavior.spec.ts › context.unrouteAll should not wait for pending handlers to complete if behavior is ignoreErrors [timeout]
-library/unroute-behavior.spec.ts › context.unrouteAll should wait for pending handlers to complete [timeout]
 library/video.spec.ts › screencast › should expose video path [timeout]
 library/video.spec.ts › screencast › should expose video path blank page [timeout]
 library/video.spec.ts › screencast › should expose video path blank popup [timeout]

tests/bidi/expectations/moz-firefox-nightly-library.txt

@@ -43,9 +43,6 @@ library/page-event-crash.spec.ts › should cancel waitForEvent when page crashe
 library/page-event-crash.spec.ts › should cancel navigation when page crashes [timeout]
 library/page-event-crash.spec.ts › should be able to close context when page crashes [timeout]
 library/popup.spec.ts › should not throw when click closes popup [timeout]
-library/unroute-behavior.spec.ts › context.unroute should not wait for pending handlers to complete [timeout]
-library/unroute-behavior.spec.ts › context.unrouteAll should not wait for pending handlers to complete if behavior is ignoreErrors [timeout]
-library/unroute-behavior.spec.ts › context.unrouteAll should wait for pending handlers to complete [timeout]
 library/video.spec.ts › screencast › should be 800x450 by default [timeout]
 library/video.spec.ts › screencast › should be 800x600 with null viewport [timeout]
 library/video.spec.ts › screencast › should capture css transformation [timeout]