chrome-devtools-frontend 1.0.1522585 → 1.0.1525561

package/front_end/third_party/puppeteer/package/src/api/ElementHandle.ts

@@ -188,19 +188,18 @@ export function bindIsolatedHandle<This extends ElementHandle<Node>>(
  * ```ts
  * import puppeteer from 'puppeteer';
  *
- * (async () => {
- *   const browser = await puppeteer.launch();
- *   const page = await browser.newPage();
- *   await page.goto('https://example.com');
- *   const hrefElement = await page.$('a');
- *   await hrefElement.click();
- *   // ...
- * })();
+ * const browser = await puppeteer.launch();
+ * const page = await browser.newPage();
+ * await page.goto('https://example.com');
+ * const hrefElement = await page.$('a');
+ * await hrefElement.click();
+ * // ...
  * ```
  *
  * ElementHandle prevents the DOM element from being garbage-collected unless the
  * handle is {@link JSHandle.dispose | disposed}. ElementHandles are auto-disposed
- * when their origin frame gets navigated.
+ * when their associated frame is navigated away or the parent
+ * context gets destroyed.
  *
  * ElementHandle instances can be used as arguments in {@link Page.$eval} and
  * {@link Page.evaluate} methods.
@@ -533,9 +532,10 @@ export abstract class ElementHandle<
    *
    * ```ts
    * const feedHandle = await page.$('.feed');
-   * expect(
-   *   await feedHandle.$$eval('.tweet', nodes => nodes.map(n => n.innerText)),
-   * ).toEqual(['Hello!', 'Hi!']);
+   *
+   * const listOfTweets = await feedHandle.$$eval('.tweet', nodes =>
+   *   nodes.map(n => n.innerText),
+   * );
    * ```
    *
    * @param selector -
@@ -600,24 +600,22 @@ export abstract class ElementHandle<
    * ```ts
    * import puppeteer from 'puppeteer';
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   let currentURL;
-   *   page
-   *     .mainFrame()
-   *     .waitForSelector('img')
-   *     .then(() => console.log('First URL with image: ' + currentURL));
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * let currentURL;
+   * page
+   *   .mainFrame()
+   *   .waitForSelector('img')
+   *   .then(() => console.log('First URL with image: ' + currentURL));
    *
-   *   for (currentURL of [
-   *     'https://example.com',
-   *     'https://google.com',
-   *     'https://bbc.com',
-   *   ]) {
-   *     await page.goto(currentURL);
-   *   }
-   *   await browser.close();
-   * })();
+   * for (currentURL of [
+   *   'https://example.com',
+   *   'https://google.com',
+   *   'https://bbc.com',
+   * ]) {
+   *   await page.goto(currentURL);
+   * }
+   * await browser.close();
    * ```
    *
    * @param selector - The selector to query and wait for.

package/front_end/third_party/puppeteer/package/src/api/Frame.ts

@@ -231,20 +231,18 @@ export const throwIfDetached = throwIfDisposed<Frame>(frame => {
  * ```ts
  * import puppeteer from 'puppeteer';
  *
- * (async () => {
- *   const browser = await puppeteer.launch();
- *   const page = await browser.newPage();
- *   await page.goto('https://www.google.com/chrome/browser/canary.html');
- *   dumpFrameTree(page.mainFrame(), '');
- *   await browser.close();
+ * const browser = await puppeteer.launch();
+ * const page = await browser.newPage();
+ * await page.goto('https://www.google.com/chrome/browser/canary.html');
+ * dumpFrameTree(page.mainFrame(), '');
+ * await browser.close();
  *
- *   function dumpFrameTree(frame, indent) {
- *     console.log(indent + frame.url());
- *     for (const child of frame.childFrames()) {
- *       dumpFrameTree(child, indent + '  ');
- *     }
+ * function dumpFrameTree(frame, indent) {
+ *   console.log(indent + frame.url());
+ *   for (const child of frame.childFrames()) {
+ *     dumpFrameTree(child, indent + '  ');
  *   }
- * })();
+ * }
  * ```
  *
  * @example
@@ -712,24 +710,22 @@ export abstract class Frame extends EventEmitter<FrameEvents> {
    * ```ts
    * import puppeteer from 'puppeteer';
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   let currentURL;
-   *   page
-   *     .mainFrame()
-   *     .waitForSelector('img')
-   *     .then(() => console.log('First URL with image: ' + currentURL));
-   *
-   *   for (currentURL of [
-   *     'https://example.com',
-   *     'https://google.com',
-   *     'https://bbc.com',
-   *   ]) {
-   *     await page.goto(currentURL);
-   *   }
-   *   await browser.close();
-   * })();
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * let currentURL;
+   * page
+   *   .mainFrame()
+   *   .waitForSelector('img')
+   *   .then(() => console.log('First URL with image: ' + currentURL));
+   *
+   * for (currentURL of [
+   *   'https://example.com',
+   *   'https://google.com',
+   *   'https://bbc.com',
+   * ]) {
+   *   await page.goto(currentURL);
+   * }
+   * await browser.close();
    * ```
    *
    * @param selector - The selector to query and wait for.
@@ -757,14 +753,14 @@ export abstract class Frame extends EventEmitter<FrameEvents> {
    * ```ts
    * import puppeteer from 'puppeteer';
    *
-   * (async () => {
-   * .  const browser = await puppeteer.launch();
-   * .  const page = await browser.newPage();
-   * .  const watchDog = page.mainFrame().waitForFunction('window.innerWidth < 100');
-   * .  page.setViewport({width: 50, height: 50});
-   * .  await watchDog;
-   * .  await browser.close();
-   * })();
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * const watchDog = page
+   *   .mainFrame()
+   *   .waitForFunction('window.innerWidth < 100');
+   * page.setViewport({width: 50, height: 50});
+   * await watchDog;
+   * await browser.close();
    * ```
    *
    * To pass arguments from Node.js to the predicate of `page.waitForFunction` function:

package/front_end/third_party/puppeteer/package/src/api/HTTPRequest.ts

@@ -174,7 +174,6 @@ export abstract class HTTPRequest {
    * `respond()` aren't called).
    */
   continueRequestOverrides(): ContinueRequestOverrides {
-    assert(this.interception.enabled, 'Request Interception is not enabled!');
     return this.interception.requestOverrides;
   }
 
@@ -183,7 +182,6 @@ export abstract class HTTPRequest {
    * interception is allowed to respond (ie, `abort()` is not called).
    */
   responseForRequest(): Partial<ResponseForRequest> | null {
-    assert(this.interception.enabled, 'Request Interception is not enabled!');
     return this.interception.response;
   }
 
@@ -191,7 +189,6 @@ export abstract class HTTPRequest {
    * The most recent reason for aborting the request
    */
   abortErrorReason(): Protocol.Network.ErrorReason | null {
-    assert(this.interception.enabled, 'Request Interception is not enabled!');
     return this.interception.abortReason;
   }
 
@@ -384,9 +381,17 @@ export abstract class HTTPRequest {
    */
   abstract failure(): {errorText: string} | null;
 
-  #canBeIntercepted(): boolean {
-    return !this.url().startsWith('data:') && !this._fromMemoryCache;
+  /**
+   * @internal
+   */
+  protected verifyInterception(): void {
+    assert(this.interception.enabled, 'Request Interception is not enabled!');
+    assert(!this.interception.handled, 'Request is already handled!');
   }
+  /**
+   * @internal
+   */
+  protected abstract canBeIntercepted(): boolean;
 
   /**
    * Continues request with optional request overrides.
@@ -420,11 +425,11 @@ export abstract class HTTPRequest {
     overrides: ContinueRequestOverrides = {},
     priority?: number,
   ): Promise<void> {
-    if (!this.#canBeIntercepted()) {
+    this.verifyInterception();
+    if (!this.canBeIntercepted()) {
       return;
     }
-    assert(this.interception.enabled, 'Request Interception is not enabled!');
-    assert(!this.interception.handled, 'Request is already handled!');
+
     if (priority === undefined) {
       return await this._continue(overrides);
     }
@@ -488,11 +493,10 @@ export abstract class HTTPRequest {
     response: Partial<ResponseForRequest>,
     priority?: number,
   ): Promise<void> {
-    if (!this.#canBeIntercepted()) {
+    this.verifyInterception();
+    if (!this.canBeIntercepted()) {
       return;
     }
-    assert(this.interception.enabled, 'Request Interception is not enabled!');
-    assert(!this.interception.handled, 'Request is already handled!');
     if (priority === undefined) {
       return await this._respond(response);
     }
@@ -534,13 +538,12 @@ export abstract class HTTPRequest {
     errorCode: ErrorCode = 'failed',
     priority?: number,
   ): Promise<void> {
-    if (!this.#canBeIntercepted()) {
+    this.verifyInterception();
+    if (!this.canBeIntercepted()) {
       return;
     }
     const errorReason = errorReasons[errorCode];
     assert(errorReason, 'Unknown error code: ' + errorCode);
-    assert(this.interception.enabled, 'Request Interception is not enabled!');
-    assert(!this.interception.handled, 'Request is already handled!');
     if (priority === undefined) {
       return await this._abort(errorReason);
     }

package/front_end/third_party/puppeteer/package/src/api/Page.ts

@@ -650,13 +650,11 @@ export function setDefaultScreenshotOptions(options: ScreenshotOptions): void {
  * ```ts
  * import puppeteer from 'puppeteer';
  *
- * (async () => {
- *   const browser = await puppeteer.launch();
- *   const page = await browser.newPage();
- *   await page.goto('https://example.com');
- *   await page.screenshot({path: 'screenshot.png'});
- *   await browser.close();
- * })();
+ * const browser = await puppeteer.launch();
+ * const page = await browser.newPage();
+ * await page.goto('https://example.com');
+ * await page.screenshot({path: 'screenshot.png'});
+ * await browser.close();
  * ```
  *
  * The Page class extends from Puppeteer's {@link EventEmitter} class and will
@@ -949,21 +947,19 @@ export abstract class Page extends EventEmitter<PageEvents> {
    *
    * ```ts
    * import puppeteer from 'puppeteer';
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   await page.setRequestInterception(true);
-   *   page.on('request', interceptedRequest => {
-   *     if (
-   *       interceptedRequest.url().endsWith('.png') ||
-   *       interceptedRequest.url().endsWith('.jpg')
-   *     )
-   *       interceptedRequest.abort();
-   *     else interceptedRequest.continue();
-   *   });
-   *   await page.goto('https://example.com');
-   *   await browser.close();
-   * })();
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * await page.setRequestInterception(true);
+   * page.on('request', interceptedRequest => {
+   *   if (
+   *     interceptedRequest.url().endsWith('.png') ||
+   *     interceptedRequest.url().endsWith('.jpg')
+   *   )
+   *     interceptedRequest.abort();
+   *   else interceptedRequest.continue();
+   * });
+   * await page.goto('https://example.com');
+   * await browser.close();
    * ```
    *
    * @param value - Whether to enable request interception.
@@ -1010,14 +1006,12 @@ export abstract class Page extends EventEmitter<PageEvents> {
    * import {PredefinedNetworkConditions} from 'puppeteer';
    * const slow3G = PredefinedNetworkConditions['Slow 3G'];
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   await page.emulateNetworkConditions(slow3G);
-   *   await page.goto('https://www.google.com');
-   *   // other actions...
-   *   await browser.close();
-   * })();
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * await page.emulateNetworkConditions(slow3G);
+   * await page.goto('https://www.google.com');
+   * // other actions...
+   * await browser.close();
    * ```
    *
    * @param networkConditions - Passing `null` disables network condition
@@ -1552,21 +1546,19 @@ export abstract class Page extends EventEmitter<PageEvents> {
    * import puppeteer from 'puppeteer';
    * import crypto from 'crypto';
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   page.on('console', msg => console.log(msg.text()));
-   *   await page.exposeFunction('md5', text =>
-   *     crypto.createHash('md5').update(text).digest('hex'),
-   *   );
-   *   await page.evaluate(async () => {
-   *     // use window.md5 to compute hashes
-   *     const myString = 'PUPPETEER';
-   *     const myHash = await window.md5(myString);
-   *     console.log(`md5 of ${myString} is ${myHash}`);
-   *   });
-   *   await browser.close();
-   * })();
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * page.on('console', msg => console.log(msg.text()));
+   * await page.exposeFunction('md5', text =>
+   *   crypto.createHash('md5').update(text).digest('hex'),
+   * );
+   * await page.evaluate(async () => {
+   *   // use window.md5 to compute hashes
+   *   const myString = 'PUPPETEER';
+   *   const myHash = await window.md5(myString);
+   *   console.log(`md5 of ${myString} is ${myHash}`);
+   * });
+   * await browser.close();
    * ```
    *
    * @example
@@ -1576,25 +1568,23 @@ export abstract class Page extends EventEmitter<PageEvents> {
    * import puppeteer from 'puppeteer';
    * import fs from 'node:fs';
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   page.on('console', msg => console.log(msg.text()));
-   *   await page.exposeFunction('readfile', async filePath => {
-   *     return new Promise((resolve, reject) => {
-   *       fs.readFile(filePath, 'utf8', (err, text) => {
-   *         if (err) reject(err);
-   *         else resolve(text);
-   *       });
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * page.on('console', msg => console.log(msg.text()));
+   * await page.exposeFunction('readfile', async filePath => {
+   *   return new Promise((resolve, reject) => {
+   *     fs.readFile(filePath, 'utf8', (err, text) => {
+   *       if (err) reject(err);
+   *       else resolve(text);
    *     });
    *   });
-   *   await page.evaluate(async () => {
-   *     // use window.readfile to read contents of a file
-   *     const content = await window.readfile('/etc/hosts');
-   *     console.log(content);
-   *   });
-   *   await browser.close();
-   * })();
+   * });
+   * await page.evaluate(async () => {
+   *   // use window.readfile to read contents of a file
+   *   const content = await window.readfile('/etc/hosts');
+   *   console.log(content);
+   * });
+   * await browser.close();
    * ```
    *
    * @param name - Name of the function on the window object
@@ -2036,14 +2026,12 @@ export abstract class Page extends EventEmitter<PageEvents> {
    * import {KnownDevices} from 'puppeteer';
    * const iPhone = KnownDevices['iPhone 15 Pro'];
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   await page.emulate(iPhone);
-   *   await page.goto('https://www.google.com');
-   *   // other actions...
-   *   await browser.close();
-   * })();
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * await page.emulate(iPhone);
+   * await page.goto('https://www.google.com');
+   * // other actions...
+   * await browser.close();
    * ```
    */
   async emulate(device: Device): Promise<void> {
@@ -2207,25 +2195,23 @@ export abstract class Page extends EventEmitter<PageEvents> {
    * ```ts
    * import puppeteer from 'puppeteer';
    *
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   await page.goto('https://v8.dev/blog/10-years');
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * await page.goto('https://v8.dev/blog/10-years');
    *
-   *   await page.emulateVisionDeficiency('achromatopsia');
-   *   await page.screenshot({path: 'achromatopsia.png'});
+   * await page.emulateVisionDeficiency('achromatopsia');
+   * await page.screenshot({path: 'achromatopsia.png'});
    *
-   *   await page.emulateVisionDeficiency('deuteranopia');
-   *   await page.screenshot({path: 'deuteranopia.png'});
+   * await page.emulateVisionDeficiency('deuteranopia');
+   * await page.screenshot({path: 'deuteranopia.png'});
    *
-   *   await page.emulateVisionDeficiency('blurredVision');
-   *   await page.screenshot({path: 'blurred-vision.png'});
+   * await page.emulateVisionDeficiency('blurredVision');
+   * await page.screenshot({path: 'blurred-vision.png'});
    *
-   *   await page.emulateVisionDeficiency('reducedContrast');
-   *   await page.screenshot({path: 'reduced-contrast.png'});
+   * await page.emulateVisionDeficiency('reducedContrast');
+   * await page.screenshot({path: 'reduced-contrast.png'});
    *
-   *   await browser.close();
-   * })();
+   * await browser.close();
    * ```
    *
    * @param type - the type of deficiency to simulate, or `'none'` to reset.
@@ -2994,22 +2980,21 @@ export abstract class Page extends EventEmitter<PageEvents> {
    *
    * ```ts
    * import puppeteer from 'puppeteer';
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   let currentURL;
-   *   page
-   *     .waitForSelector('img')
-   *     .then(() => console.log('First URL with image: ' + currentURL));
-   *   for (currentURL of [
-   *     'https://example.com',
-   *     'https://google.com',
-   *     'https://bbc.com',
-   *   ]) {
-   *     await page.goto(currentURL);
-   *   }
-   *   await browser.close();
-   * })();
+   *
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * let currentURL;
+   * page
+   *   .waitForSelector('img')
+   *   .then(() => console.log('First URL with image: ' + currentURL));
+   * for (currentURL of [
+   *   'https://example.com',
+   *   'https://google.com',
+   *   'https://bbc.com',
+   * ]) {
+   *   await page.goto(currentURL);
+   * }
+   * await browser.close();
    * ```
    *
    * @param selector -
@@ -3063,14 +3048,13 @@ export abstract class Page extends EventEmitter<PageEvents> {
    *
    * ```ts
    * import puppeteer from 'puppeteer';
-   * (async () => {
-   *   const browser = await puppeteer.launch();
-   *   const page = await browser.newPage();
-   *   const watchDog = page.waitForFunction('window.innerWidth < 100');
-   *   await page.setViewport({width: 50, height: 50});
-   *   await watchDog;
-   *   await browser.close();
-   * })();
+   *
+   * const browser = await puppeteer.launch();
+   * const page = await browser.newPage();
+   * const watchDog = page.waitForFunction('window.innerWidth < 100');
+   * await page.setViewport({width: 50, height: 50});
+   * await watchDog;
+   * await browser.close();
    * ```
    *
    * @example

package/front_end/third_party/puppeteer/package/src/bidi/Browser.ts

@@ -92,10 +92,12 @@ export class BidiBrowser extends Browser {
       },
     });
 
+    // Subscribe to all WebDriver BiDi events. Also subscribe to CDP events if CDP
+    // connection is available.
     await session.subscribe(
-      (session.capabilities.browserName.toLocaleLowerCase().includes('firefox')
-        ? BidiBrowser.subscribeModules
-        : [...BidiBrowser.subscribeModules, ...BidiBrowser.subscribeCdpEvents]
+      (opts.cdpConnection
+        ? [...BidiBrowser.subscribeModules, ...BidiBrowser.subscribeCdpEvents]
+        : BidiBrowser.subscribeModules
       ).filter(module => {
         if (!opts.networkEnabled) {
           return (

package/front_end/third_party/puppeteer/package/src/bidi/Frame.ts

@@ -136,7 +136,11 @@ export class BidiFrame extends Frame {
     });
 
     this.browsingContext.on('request', ({request}) => {
-      const httpRequest = BidiHTTPRequest.from(request, this);
+      const httpRequest = BidiHTTPRequest.from(
+        request,
+        this,
+        this.page().isNetworkInterceptionEnabled,
+      );
       request.once('success', () => {
         this.page().trustedEmitter.emit(PageEvent.RequestFinished, httpRequest);
       });

package/front_end/third_party/puppeteer/package/src/bidi/HTTPRequest.ts

@@ -9,6 +9,7 @@ import type * as Bidi from 'webdriver-bidi-protocol';
 import type {CDPSession} from '../api/CDPSession.js';
 import type {
   ContinueRequestOverrides,
+  InterceptResolutionState,
   ResponseForRequest,
 } from '../api/HTTPRequest.js';
 import {
@@ -16,6 +17,7 @@ import {
   STATUS_TEXTS,
   type ResourceType,
   handleError,
+  InterceptResolutionAction,
 } from '../api/HTTPRequest.js';
 import {PageEvent} from '../api/Page.js';
 import {UnsupportedOperation} from '../common/Errors.js';
@@ -34,9 +36,15 @@ export class BidiHTTPRequest extends HTTPRequest {
   static from(
     bidiRequest: Request,
     frame: BidiFrame,
+    isNetworkInterceptionEnabled: boolean,
     redirect?: BidiHTTPRequest,
   ): BidiHTTPRequest {
-    const request = new BidiHTTPRequest(bidiRequest, frame, redirect);
+    const request = new BidiHTTPRequest(
+      bidiRequest,
+      frame,
+      isNetworkInterceptionEnabled,
+      redirect,
+    );
     request.#initialize();
     return request;
   }
@@ -50,12 +58,13 @@ export class BidiHTTPRequest extends HTTPRequest {
   private constructor(
     request: Request,
     frame: BidiFrame,
+    isNetworkInterceptionEnabled: boolean,
     redirect?: BidiHTTPRequest,
   ) {
     super();
     requests.set(request, this);
 
-    this.interception.enabled = request.isBlocked;
+    this.interception.enabled = isNetworkInterceptionEnabled;
 
     this.#request = request;
     this.#frame = frame;
@@ -69,7 +78,12 @@ export class BidiHTTPRequest extends HTTPRequest {
 
   #initialize() {
     this.#request.on('redirect', request => {
-      const httpRequest = BidiHTTPRequest.from(request, this.#frame, this);
+      const httpRequest = BidiHTTPRequest.from(
+        request,
+        this.#frame,
+        this.interception.enabled,
+        this,
+      );
       this.#redirectChain.push(this);
 
       request.once('success', () => {
@@ -108,6 +122,17 @@ export class BidiHTTPRequest extends HTTPRequest {
     }
   }
 
+  protected canBeIntercepted(): boolean {
+    return this.#request.isBlocked;
+  }
+
+  override interceptResolutionState(): InterceptResolutionState {
+    if (!this.#request.isBlocked) {
+      return {action: InterceptResolutionAction.Disabled};
+    }
+    return super.interceptResolutionState();
+  }
+
   override url(): string {
     return this.#request.url;
   }