chrome-devtools-frontend 1.0.1367881 → 1.0.1380117

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

@@ -22,7 +22,7 @@ export class BidiHTTPResponse extends HTTPResponse {
   static from(
     data: Bidi.Network.ResponseData,
     request: BidiHTTPRequest,
-    cdpSupported: boolean
+    cdpSupported: boolean,
   ): BidiHTTPResponse {
     const response = new BidiHTTPResponse(data, request, cdpSupported);
     response.#initialize();
@@ -37,7 +37,7 @@ export class BidiHTTPResponse extends HTTPResponse {
   private constructor(
     data: Bidi.Network.ResponseData,
     request: BidiHTTPRequest,
-    cdpSupported: boolean
+    cdpSupported: boolean,
   ) {
     super();
     this.#data = data;
@@ -48,7 +48,7 @@ export class BidiHTTPResponse extends HTTPResponse {
     const securityDetails = data['goog:securityDetails'];
     if (cdpSupported && securityDetails) {
       this.#securityDetails = new SecurityDetails(
-        securityDetails as Protocol.Network.SecurityDetails
+        securityDetails as Protocol.Network.SecurityDetails,
       );
     }
   }

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

@@ -12,6 +12,7 @@ import {
   Mouse,
   MouseButton,
   Touchscreen,
+  type TouchHandle,
   type KeyboardTypeOptions,
   type KeyDownOptions,
   type KeyPressOptions,
@@ -21,6 +22,7 @@ import {
   type MouseWheelOptions,
 } from '../api/Input.js';
 import {UnsupportedOperation} from '../common/Errors.js';
+import {TouchError} from '../common/Errors.js';
 import type {KeyInput} from '../common/USKeyboardLayout.js';
 
 import type {BidiPage} from './Page.js';
@@ -285,7 +287,7 @@ export class BidiKeyboard extends Keyboard {
 
   override async down(
     key: KeyInput,
-    _options?: Readonly<KeyDownOptions>
+    _options?: Readonly<KeyDownOptions>,
   ): Promise<void> {
     await this.#page.mainFrame().browsingContext.performActions([
       {
@@ -318,7 +320,7 @@ export class BidiKeyboard extends Keyboard {
 
   override async press(
     key: KeyInput,
-    options: Readonly<KeyPressOptions> = {}
+    options: Readonly<KeyPressOptions> = {},
   ): Promise<void> {
     const {delay = 0} = options;
     const actions: Bidi.Input.KeySourceAction[] = [
@@ -348,7 +350,7 @@ export class BidiKeyboard extends Keyboard {
 
   override async type(
     text: string,
-    options: Readonly<KeyboardTypeOptions> = {}
+    options: Readonly<KeyboardTypeOptions> = {},
   ): Promise<void> {
     const {delay = 0} = options;
     // This spread separates the characters into code points rather than UTF-16
@@ -365,7 +367,7 @@ export class BidiKeyboard extends Keyboard {
           {
             type: ActionType.KeyUp,
             value,
-          }
+          },
         );
       }
     } else {
@@ -382,7 +384,7 @@ export class BidiKeyboard extends Keyboard {
           {
             type: ActionType.KeyUp,
             value,
-          }
+          },
         );
       }
     }
@@ -463,7 +465,7 @@ export class BidiMouse extends Mouse {
   override async move(
     x: number,
     y: number,
-    options: Readonly<BidiMouseMoveOptions> = {}
+    options: Readonly<BidiMouseMoveOptions> = {},
   ): Promise<void> {
     const from = this.#lastMovePoint;
     const to = {
@@ -529,7 +531,7 @@ export class BidiMouse extends Mouse {
   override async click(
     x: number,
     y: number,
-    options: Readonly<BidiMouseClickOptions> = {}
+    options: Readonly<BidiMouseClickOptions> = {},
   ): Promise<void> {
     const actions: Bidi.Input.PointerSourceAction[] = [
       {
@@ -568,7 +570,7 @@ export class BidiMouse extends Mouse {
   }
 
   override async wheel(
-    options: Readonly<MouseWheelOptions> = {}
+    options: Readonly<MouseWheelOptions> = {},
   ): Promise<void> {
     await this.#page.mainFrame().browsingContext.performActions([
       {
@@ -613,79 +615,87 @@ export class BidiMouse extends Mouse {
 /**
  * @internal
  */
-export class BidiTouchscreen extends Touchscreen {
+class BidiTouchHandle implements TouchHandle {
+  #started = false;
+  #x: number;
+  #y: number;
+  #bidiId: string;
   #page: BidiPage;
+  #touchScreen: BidiTouchscreen;
+  #properties: Bidi.Input.PointerCommonProperties;
 
-  constructor(page: BidiPage) {
-    super();
+  constructor(
+    page: BidiPage,
+    touchScreen: BidiTouchscreen,
+    id: number,
+    x: number,
+    y: number,
+    properties: Bidi.Input.PointerCommonProperties,
+  ) {
     this.#page = page;
+    this.#touchScreen = touchScreen;
+    this.#x = Math.round(x);
+    this.#y = Math.round(y);
+    this.#properties = properties;
+    this.#bidiId = `${InputId.Finger}_${id}`;
   }
 
-  override async touchStart(
-    x: number,
-    y: number,
-    options: BidiTouchMoveOptions = {}
-  ): Promise<void> {
+  async start(options: BidiTouchMoveOptions = {}): Promise<void> {
+    if (this.#started) {
+      throw new TouchError('Touch has already started');
+    }
     await this.#page.mainFrame().browsingContext.performActions([
       {
         type: SourceActionsType.Pointer,
-        id: InputId.Finger,
+        id: this.#bidiId,
         parameters: {
           pointerType: Bidi.Input.PointerType.Touch,
         },
         actions: [
           {
             type: ActionType.PointerMove,
-            x: Math.round(x),
-            y: Math.round(y),
+            x: this.#x,
+            y: this.#y,
             origin: options.origin,
           },
           {
+            ...this.#properties,
             type: ActionType.PointerDown,
             button: 0,
-            width: 0.5 * 2, // 2 times default touch radius.
-            height: 0.5 * 2, // 2 times default touch radius.
-            pressure: 0.5,
-            altitudeAngle: Math.PI / 2,
           },
         ],
       },
     ]);
+    this.#started = true;
   }
 
-  override async touchMove(
-    x: number,
-    y: number,
-    options: BidiTouchMoveOptions = {}
-  ): Promise<void> {
-    await this.#page.mainFrame().browsingContext.performActions([
+  move(x: number, y: number): Promise<void> {
+    const newX = Math.round(x);
+    const newY = Math.round(y);
+    return this.#page.mainFrame().browsingContext.performActions([
       {
         type: SourceActionsType.Pointer,
-        id: InputId.Finger,
+        id: this.#bidiId,
         parameters: {
           pointerType: Bidi.Input.PointerType.Touch,
         },
         actions: [
           {
+            ...this.#properties,
             type: ActionType.PointerMove,
-            x: Math.round(x),
-            y: Math.round(y),
-            origin: options.origin,
-            width: 0.5 * 2, // 2 times default touch radius.
-            height: 0.5 * 2, // 2 times default touch radius.
-            pressure: 0.5,
-            altitudeAngle: Math.PI / 2,
+            x: newX,
+            y: newY,
           },
         ],
       },
     ]);
   }
 
-  override async touchEnd(): Promise<void> {
+  async end(): Promise<void> {
     await this.#page.mainFrame().browsingContext.performActions([
       {
         type: SourceActionsType.Pointer,
-        id: InputId.Finger,
+        id: this.#bidiId,
         parameters: {
           pointerType: Bidi.Input.PointerType.Touch,
         },
@@ -697,5 +707,36 @@ export class BidiTouchscreen extends Touchscreen {
         ],
       },
     ]);
+    this.#touchScreen.removeHandle(this);
+  }
+}
+/**
+ * @internal
+ */
+export class BidiTouchscreen extends Touchscreen {
+  #page: BidiPage;
+  declare touches: BidiTouchHandle[];
+
+  constructor(page: BidiPage) {
+    super();
+    this.#page = page;
+  }
+
+  override async touchStart(
+    x: number,
+    y: number,
+    options: BidiTouchMoveOptions = {},
+  ): Promise<TouchHandle> {
+    const id = this.idGenerator();
+    const properties: Bidi.Input.PointerCommonProperties = {
+      width: 0.5 * 2, // 2 times default touch radius.
+      height: 0.5 * 2, // 2 times default touch radius.
+      pressure: 0.5,
+      altitudeAngle: Math.PI / 2,
+    };
+    const touch = new BidiTouchHandle(this.#page, this, id, x, y, properties);
+    await touch.start(options);
+    this.touches.push(touch);
+    return touch;
   }
 }

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

@@ -19,7 +19,7 @@ import type {BidiRealm} from './Realm.js';
 export class BidiJSHandle<T = unknown> extends JSHandle<T> {
   static from<T>(
     value: Bidi.Script.RemoteValue,
-    realm: BidiRealm
+    realm: BidiRealm,
   ): BidiJSHandle<T> {
     return new BidiJSHandle(value, realm);
   }

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

@@ -72,7 +72,7 @@ import type {BidiWebWorker} from './WebWorker.js';
 export class BidiPage extends Page {
   static from(
     browserContext: BidiBrowserContext,
-    browsingContext: BrowsingContext
+    browsingContext: BrowsingContext,
   ): BidiPage {
     const page = new BidiPage(browserContext, browsingContext);
     page.#initialize();
@@ -102,7 +102,7 @@ export class BidiPage extends Page {
 
   private constructor(
     browserContext: BidiBrowserContext,
-    browsingContext: BrowsingContext
+    browsingContext: BrowsingContext,
   ) {
     super();
     this.#browserContext = browserContext;
@@ -137,11 +137,11 @@ export class BidiPage extends Page {
   #userAgentPreloadScript?: string;
   override async setUserAgent(
     userAgent: string,
-    userAgentMetadata?: Protocol.Emulation.UserAgentMetadata
+    userAgentMetadata?: Protocol.Emulation.UserAgentMetadata,
   ): Promise<void> {
     if (!this.#browserContext.browser().cdpSupported && userAgentMetadata) {
       throw new UnsupportedOperation(
-        'Current Browser does not support `userAgentMetadata`'
+        'Current Browser does not support `userAgentMetadata`',
       );
     } else if (
       this.#browserContext.browser().cdpSupported &&
@@ -164,7 +164,7 @@ export class BidiPage extends Page {
     this.#userAgentInterception = await this.#toggleInterception(
       [Bidi.Network.InterceptPhase.BeforeRequestSent],
       this.#userAgentInterception,
-      enable
+      enable,
     );
 
     const changeUserAgent = (userAgent: string) => {
@@ -180,7 +180,7 @@ export class BidiPage extends Page {
 
     if (this.#userAgentPreloadScript) {
       await this.removeScriptToEvaluateOnNewDocument(
-        this.#userAgentPreloadScript
+        this.#userAgentPreloadScript,
       );
     }
     const [evaluateToken] = await Promise.all([
@@ -202,12 +202,12 @@ export class BidiPage extends Page {
   }
 
   override async queryObjects<Prototype>(
-    prototypeHandle: BidiJSHandle<Prototype>
+    prototypeHandle: BidiJSHandle<Prototype>,
   ): Promise<BidiJSHandle<Prototype[]>> {
     assert(!prototypeHandle.disposed, 'Prototype JSHandle is disposed!');
     assert(
       prototypeHandle.id,
-      'Prototype JSHandle must not be referencing primitive value'
+      'Prototype JSHandle must not be referencing primitive value',
     );
     const response = await this.#frame.client.send('Runtime.queryObjects', {
       prototypeObjectId: prototypeHandle.id,
@@ -277,7 +277,7 @@ export class BidiPage extends Page {
   }
 
   override async reload(
-    options: WaitForOptions = {}
+    options: WaitForOptions = {},
   ): Promise<BidiHTTPResponse | null> {
     const [response] = await Promise.all([
       this.#frame.waitForNavigation(options),
@@ -285,8 +285,8 @@ export class BidiPage extends Page {
     ]).catch(
       rewriteNavigationError(
         this.url(),
-        options.timeout ?? this._timeoutSettings.navigationTimeout()
-      )
+        options.timeout ?? this._timeoutSettings.navigationTimeout(),
+      ),
     );
     return response;
   }
@@ -324,7 +324,7 @@ export class BidiPage extends Page {
   }
 
   override async emulateMediaFeatures(
-    features?: MediaFeature[]
+    features?: MediaFeature[],
   ): Promise<void> {
     return await this.#cdpEmulationManager.emulateMediaFeatures(features);
   }
@@ -341,7 +341,7 @@ export class BidiPage extends Page {
   }
 
   override async emulateVisionDeficiency(
-    type?: Protocol.Emulation.SetEmulatedVisionDeficiencyRequest['type']
+    type?: Protocol.Emulation.SetEmulatedVisionDeficiencyRequest['type'],
   ): Promise<void> {
     return await this.#cdpEmulationManager.emulateVisionDeficiency(type);
   }
@@ -396,8 +396,8 @@ export class BidiPage extends Page {
           .isolatedRealm()
           .evaluate(() => {
             return document.fonts.ready;
-          })
-      ).pipe(raceWith(timeout(ms)))
+          }),
+      ).pipe(raceWith(timeout(ms))),
     );
 
     const data = await firstValueFrom(
@@ -413,8 +413,8 @@ export class BidiPage extends Page {
           pageRanges,
           scale,
           shrinkToFit: !preferCSSPageSize,
-        })
-      ).pipe(raceWith(timeout(ms)))
+        }),
+      ).pipe(raceWith(timeout(ms))),
     );
 
     const typedArray = stringToTypedArray(data, true);
@@ -425,7 +425,7 @@ export class BidiPage extends Page {
   }
 
   override async createPDFStream(
-    options?: PDFOptions | undefined
+    options?: PDFOptions | undefined,
   ): Promise<ReadableStream<Uint8Array>> {
     const typedArray = await this.pdf(options);
 
@@ -438,7 +438,7 @@ export class BidiPage extends Page {
   }
 
   override async _screenshot(
-    options: Readonly<ScreenshotOptions>
+    options: Readonly<ScreenshotOptions>,
   ): Promise<string> {
     const {clip, type, captureBeyondViewport, quality} = options;
     if (options.omitBackground !== undefined && options.omitBackground) {
@@ -446,7 +446,7 @@ export class BidiPage extends Page {
     }
     if (options.optimizeForSpeed !== undefined && options.optimizeForSpeed) {
       throw new UnsupportedOperation(
-        `BiDi does not support 'optimizeForSpeed'.`
+        `BiDi does not support 'optimizeForSpeed'.`,
       );
     }
     if (options.fromSurface !== undefined && !options.fromSurface) {
@@ -454,7 +454,7 @@ export class BidiPage extends Page {
     }
     if (clip !== undefined && clip.scale !== undefined && clip.scale !== 1) {
       throw new UnsupportedOperation(
-        `BiDi does not support 'scale' in 'clip'.`
+        `BiDi does not support 'scale' in 'clip'.`,
       );
     }
 
@@ -517,7 +517,7 @@ export class BidiPage extends Page {
   }
 
   override async removeScriptToEvaluateOnNewDocument(
-    id: string
+    id: string,
   ): Promise<void> {
     await this.#frame.browsingContext.removePreloadScript(id);
   }
@@ -526,11 +526,11 @@ export class BidiPage extends Page {
     name: string,
     pptrFunction:
       | ((...args: Args) => Awaitable<Ret>)
-      | {default: (...args: Args) => Awaitable<Ret>}
+      | {default: (...args: Args) => Awaitable<Ret>},
   ): Promise<void> {
     return await this.mainFrame().exposeFunction(
       name,
-      'default' in pptrFunction ? pptrFunction.default : pptrFunction
+      'default' in pptrFunction ? pptrFunction.default : pptrFunction,
     );
   }
 
@@ -541,7 +541,7 @@ export class BidiPage extends Page {
   override async setCacheEnabled(enabled?: boolean): Promise<void> {
     if (!this.#browserContext.browser().cdpSupported) {
       await this.#frame.browsingContext.setCacheBehavior(
-        enabled ? 'default' : 'bypass'
+        enabled ? 'default' : 'bypass',
       );
       return;
     }
@@ -589,7 +589,7 @@ export class BidiPage extends Page {
     this.#userInterception = await this.#toggleInterception(
       [Bidi.Network.InterceptPhase.BeforeRequestSent],
       this.#userInterception,
-      enable
+      enable,
     );
   }
 
@@ -599,13 +599,13 @@ export class BidiPage extends Page {
   _extraHTTPHeaders: Record<string, string> = {};
   #extraHeadersInterception?: string;
   override async setExtraHTTPHeaders(
-    headers: Record<string, string>
+    headers: Record<string, string>,
   ): Promise<void> {
     const extraHTTPHeaders: Record<string, string> = {};
     for (const [key, value] of Object.entries(headers)) {
       assert(
         isString(value),
-        `Expected value of header "${key}" to be String, but "${typeof value}" is found.`
+        `Expected value of header "${key}" to be String, but "${typeof value}" is found.`,
       );
       extraHTTPHeaders[key.toLowerCase()] = value;
     }
@@ -614,7 +614,7 @@ export class BidiPage extends Page {
     this.#extraHeadersInterception = await this.#toggleInterception(
       [Bidi.Network.InterceptPhase.BeforeRequestSent],
       this.#extraHeadersInterception,
-      Boolean(Object.keys(this._extraHTTPHeaders).length)
+      Boolean(Object.keys(this._extraHTTPHeaders).length),
     );
   }
 
@@ -627,7 +627,7 @@ export class BidiPage extends Page {
     this.#authInterception = await this.#toggleInterception(
       [Bidi.Network.InterceptPhase.AuthRequired],
       this.#authInterception,
-      Boolean(credentials)
+      Boolean(credentials),
     );
 
     this._credentials = credentials;
@@ -636,7 +636,7 @@ export class BidiPage extends Page {
   async #toggleInterception(
     phases: [Bidi.Network.InterceptPhase, ...Bidi.Network.InterceptPhase[]],
     interception: string | undefined,
-    expected: boolean
+    expected: boolean,
   ): Promise<string | undefined> {
     if (expected && !interception) {
       return await this.#frame.browsingContext.addIntercept({
@@ -644,7 +644,7 @@ export class BidiPage extends Page {
       });
     } else if (!expected && interception) {
       await this.#frame.browsingContext.userContext.browser.removeIntercept(
-        interception
+        interception,
       );
       return;
     }
@@ -677,7 +677,7 @@ export class BidiPage extends Page {
   }
 
   override async emulateNetworkConditions(
-    networkConditions: NetworkConditions | null
+    networkConditions: NetworkConditions | null,
   ): Promise<void> {
     if (!this.#browserContext.browser().cdpSupported) {
       throw new UnsupportedOperation();
@@ -724,11 +724,11 @@ export class BidiPage extends Page {
       }
       assert(
         cookieUrl !== 'about:blank',
-        `Blank page can not have cookie "${cookie.name}"`
+        `Blank page can not have cookie "${cookie.name}"`,
       );
       assert(
         !String.prototype.startsWith.call(cookieUrl || '', 'data:'),
-        `Data URL page can not have cookie "${cookie.name}"`
+        `Data URL page can not have cookie "${cookie.name}"`,
       );
 
       const normalizedUrl = URL.canParse(cookieUrl)
@@ -738,7 +738,7 @@ export class BidiPage extends Page {
       const domain = cookie.domain ?? normalizedUrl?.hostname;
       assert(
         domain !== undefined,
-        `At least one of the url and domain needs to be specified`
+        `At least one of the url and domain needs to be specified`,
       );
 
       const bidiCookie: Bidi.Storage.PartialCookie = {
@@ -761,14 +761,14 @@ export class BidiPage extends Page {
           'sameParty',
           'sourceScheme',
           'priority',
-          'url'
+          'url',
         ),
       };
 
       if (cookie.partitionKey !== undefined) {
         await this.browserContext().userContext.setCookie(
           bidiCookie,
-          cookie.partitionKey
+          cookie.partitionKey,
         );
       } else {
         await this.#frame.browsingContext.setCookie(bidiCookie);
@@ -789,7 +789,7 @@ export class BidiPage extends Page {
         const domain = deleteCookieRequest.domain ?? normalizedUrl?.hostname;
         assert(
           domain !== undefined,
-          `At least one of the url and domain needs to be specified`
+          `At least one of the url and domain needs to be specified`,
         );
 
         const filter = {
@@ -800,7 +800,7 @@ export class BidiPage extends Page {
             : {}),
         };
         await this.#frame.browsingContext.deleteCookie(filter);
-      })
+      }),
     );
   }
 
@@ -813,20 +813,20 @@ export class BidiPage extends Page {
   }
 
   override async goBack(
-    options: WaitForOptions = {}
+    options: WaitForOptions = {},
   ): Promise<HTTPResponse | null> {
     return await this.#go(-1, options);
   }
 
   override async goForward(
-    options: WaitForOptions = {}
+    options: WaitForOptions = {},
   ): Promise<HTTPResponse | null> {
     return await this.#go(1, options);
   }
 
   async #go(
     delta: number,
-    options: WaitForOptions
+    options: WaitForOptions,
   ): Promise<HTTPResponse | null> {
     const controller = new AbortController();
 
@@ -855,24 +855,28 @@ export class BidiPage extends Page {
   }
 }
 
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 function evaluationExpression(fun: Function | string, ...args: unknown[]) {
   return `() => {${evaluationString(fun, ...args)}}`;
 }
 
 /**
  * Check domains match.
- * According to cookies spec, this check should match subdomains as well, but CDP
- * implementation does not do that, so this method matches only the exact domains, not
- * what is written in the spec:
- * https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.3
  */
 function testUrlMatchCookieHostname(
   cookie: Cookie,
-  normalizedUrl: URL
+  normalizedUrl: URL,
 ): boolean {
   const cookieDomain = cookie.domain.toLowerCase();
   const urlHostname = normalizedUrl.hostname.toLowerCase();
-  return cookieDomain === urlHostname;
+  if (cookieDomain === urlHostname) {
+    return true;
+  }
+  // TODO: does not consider additional restrictions w.r.t to IP
+  // addresses which is fine as it is for representation and does not
+  // mean that cookies actually apply that way in the browser.
+  // https://datatracker.ietf.org/doc/html/rfc6265#section-5.1.3
+  return cookieDomain.startsWith('.') && urlHostname.endsWith(cookieDomain);
 }
 
 /**
@@ -949,7 +953,7 @@ function bidiToPuppeteerCookie(bidiCookie: Bidi.Network.Cookie): Cookie {
       'sameParty',
       'sourceScheme',
       'partitionKeyOpaque',
-      'priority'
+      'priority',
     ),
     ...getParitionKey(),
   };
@@ -991,13 +995,13 @@ function cdpSpecificCookiePropertiesFromPuppeteerToBidi(
 }
 
 function convertCookiesSameSiteBiDiToCdp(
-  sameSite: Bidi.Network.SameSite | undefined
+  sameSite: Bidi.Network.SameSite | undefined,
 ): CookieSameSite {
   return sameSite === 'strict' ? 'Strict' : sameSite === 'lax' ? 'Lax' : 'None';
 }
 
 function convertCookiesSameSiteCdpToBiDi(
-  sameSite: CookieSameSite | undefined
+  sameSite: CookieSameSite | undefined,
 ): Bidi.Network.SameSite {
   return sameSite === 'Strict'
     ? Bidi.Network.SameSite.Strict