chrome-devtools-frontend 1.0.1367881 → 1.0.1380117

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

@@ -13,6 +13,7 @@ import {
   Mouse,
   MouseButton,
   Touchscreen,
+  type TouchHandle,
   type KeyDownOptions,
   type KeyPressOptions,
   type KeyboardTypeOptions,
@@ -21,6 +22,7 @@ import {
   type MouseOptions,
   type MouseWheelOptions,
 } from '../api/Input.js';
+import {TouchError} from '../common/Errors.js';
 import {
   _keyDefinitions,
   type KeyDefinition,
@@ -55,7 +57,7 @@ export class CdpKeyboard extends Keyboard {
     options: Readonly<KeyDownOptions> = {
       text: undefined,
       commands: [],
-    }
+    },
   ): Promise<void> {
     const description = this.#keyDescriptionForString(key);
 
@@ -174,7 +176,7 @@ export class CdpKeyboard extends Keyboard {
 
   override async type(
     text: string,
-    options: Readonly<KeyboardTypeOptions> = {}
+    options: Readonly<KeyboardTypeOptions> = {},
   ): Promise<void> {
     const delay = options.delay || undefined;
     for (const char of text) {
@@ -193,7 +195,7 @@ export class CdpKeyboard extends Keyboard {
 
   override async press(
     key: KeyInput,
-    options: Readonly<KeyPressOptions> = {}
+    options: Readonly<KeyPressOptions> = {},
   ): Promise<void> {
     const {delay = null} = options;
     await this.down(key, options);
@@ -238,7 +240,7 @@ const getFlag = (button: MouseButton): MouseButtonFlag => {
  * https://source.chromium.org/chromium/chromium/src/+/refs/heads/main:content/browser/renderer_host/input/web_input_event_builders_mac.mm;drc=a61b95c63b0b75c1cfe872d9c8cdf927c226046e;bpv=1;bpt=1;l=221.
  */
 const getButtonFromPressedButtons = (
-  buttons: number
+  buttons: number,
 ): Protocol.Input.MouseButton => {
   if (buttons & MouseButtonFlag.Left) {
     return MouseButton.Left;
@@ -319,7 +321,9 @@ export class CdpMouse extends Mouse {
    * the error of the action.
    */
   async #withTransaction(
-    action: (update: (updates: Partial<MouseState>) => void) => Promise<unknown>
+    action: (
+      update: (updates: Partial<MouseState>) => void,
+    ) => Promise<unknown>,
   ): Promise<void> {
     const {update, commit, rollback} = this.#createTransaction();
     try {
@@ -353,7 +357,7 @@ export class CdpMouse extends Mouse {
   override async move(
     x: number,
     y: number,
-    options: Readonly<MouseMoveOptions> = {}
+    options: Readonly<MouseMoveOptions> = {},
   ): Promise<void> {
     const {steps = 1} = options;
     const from = this.#state.position;
@@ -431,7 +435,7 @@ export class CdpMouse extends Mouse {
   override async click(
     x: number,
     y: number,
-    options: Readonly<MouseClickOptions> = {}
+    options: Readonly<MouseClickOptions> = {},
   ): Promise<void> {
     const {delay, count = 1, clickCount = count} = options;
     if (count < 1) {
@@ -442,7 +446,7 @@ export class CdpMouse extends Mouse {
       for (let i = 1; i < count; ++i) {
         actions.push(
           this.down({...options, clickCount: i}),
-          this.up({...options, clickCount: i})
+          this.up({...options, clickCount: i}),
         );
       }
     }
@@ -459,7 +463,7 @@ export class CdpMouse extends Mouse {
   }
 
   override async wheel(
-    options: Readonly<MouseWheelOptions> = {}
+    options: Readonly<MouseWheelOptions> = {},
   ): Promise<void> {
     const {deltaX = 0, deltaY = 0} = options;
     const {position, buttons} = this.#state;
@@ -476,7 +480,7 @@ export class CdpMouse extends Mouse {
 
   override async drag(
     start: Point,
-    target: Point
+    target: Point,
   ): Promise<Protocol.Input.DragData> {
     const promise = new Promise<Protocol.Input.DragData>(resolve => {
       this.#client.once('Input.dragIntercepted', event => {
@@ -491,7 +495,7 @@ export class CdpMouse extends Mouse {
 
   override async dragEnter(
     target: Point,
-    data: Protocol.Input.DragData
+    data: Protocol.Input.DragData,
   ): Promise<void> {
     await this.#client.send('Input.dispatchDragEvent', {
       type: 'dragEnter',
@@ -504,7 +508,7 @@ export class CdpMouse extends Mouse {
 
   override async dragOver(
     target: Point,
-    data: Protocol.Input.DragData
+    data: Protocol.Input.DragData,
   ): Promise<void> {
     await this.#client.send('Input.dispatchDragEvent', {
       type: 'dragOver',
@@ -517,7 +521,7 @@ export class CdpMouse extends Mouse {
 
   override async drop(
     target: Point,
-    data: Protocol.Input.DragData
+    data: Protocol.Input.DragData,
   ): Promise<void> {
     await this.#client.send('Input.dispatchDragEvent', {
       type: 'drop',
@@ -531,7 +535,7 @@ export class CdpMouse extends Mouse {
   override async dragAndDrop(
     start: Point,
     target: Point,
-    options: {delay?: number} = {}
+    options: {delay?: number} = {},
   ): Promise<void> {
     const {delay = null} = options;
     const data = await this.drag(start, target);
@@ -550,57 +554,100 @@ export class CdpMouse extends Mouse {
 /**
  * @internal
  */
-export class CdpTouchscreen extends Touchscreen {
+class CdpTouchHandle implements TouchHandle {
+  #started = false;
+  #touchScreen: CdpTouchscreen;
+  #touchPoint: Protocol.Input.TouchPoint;
   #client: CDPSession;
   #keyboard: CdpKeyboard;
 
-  constructor(client: CDPSession, keyboard: CdpKeyboard) {
-    super();
+  constructor(
+    client: CDPSession,
+    touchScreen: CdpTouchscreen,
+    keyboard: CdpKeyboard,
+    touchPoint: Protocol.Input.TouchPoint,
+  ) {
     this.#client = client;
+    this.#touchScreen = touchScreen;
     this.#keyboard = keyboard;
+    this.#touchPoint = touchPoint;
   }
 
   updateClient(client: CDPSession): void {
     this.#client = client;
   }
 
-  override async touchStart(x: number, y: number): Promise<void> {
+  async start(): Promise<void> {
+    if (this.#started) {
+      throw new TouchError('Touch has already started');
+    }
     await this.#client.send('Input.dispatchTouchEvent', {
       type: 'touchStart',
-      touchPoints: [
-        {
-          x: Math.round(x),
-          y: Math.round(y),
-          radiusX: 0.5,
-          radiusY: 0.5,
-          force: 0.5,
-        },
-      ],
+      touchPoints: [this.#touchPoint],
       modifiers: this.#keyboard._modifiers,
     });
+    this.#started = true;
   }
 
-  override async touchMove(x: number, y: number): Promise<void> {
-    await this.#client.send('Input.dispatchTouchEvent', {
+  move(x: number, y: number): Promise<void> {
+    this.#touchPoint.x = Math.round(x);
+    this.#touchPoint.y = Math.round(y);
+    return this.#client.send('Input.dispatchTouchEvent', {
       type: 'touchMove',
-      touchPoints: [
-        {
-          x: Math.round(x),
-          y: Math.round(y),
-          radiusX: 0.5,
-          radiusY: 0.5,
-          force: 0.5,
-        },
-      ],
+      touchPoints: [this.#touchPoint],
       modifiers: this.#keyboard._modifiers,
     });
   }
 
-  override async touchEnd(): Promise<void> {
+  async end(): Promise<void> {
     await this.#client.send('Input.dispatchTouchEvent', {
       type: 'touchEnd',
-      touchPoints: [],
+      touchPoints: [this.#touchPoint],
       modifiers: this.#keyboard._modifiers,
     });
+    this.#touchScreen.removeHandle(this);
+  }
+}
+
+/**
+ * @internal
+ */
+export class CdpTouchscreen extends Touchscreen {
+  #client: CDPSession;
+  #keyboard: CdpKeyboard;
+  declare touches: CdpTouchHandle[];
+
+  constructor(client: CDPSession, keyboard: CdpKeyboard) {
+    super();
+    this.#client = client;
+    this.#keyboard = keyboard;
+  }
+
+  updateClient(client: CDPSession): void {
+    this.#client = client;
+    this.touches.forEach(t => {
+      t.updateClient(client);
+    });
+  }
+
+  override async touchStart(x: number, y: number): Promise<TouchHandle> {
+    const id = this.idGenerator();
+    const touchPoint: Protocol.Input.TouchPoint = {
+      x: Math.round(x),
+      y: Math.round(y),
+      radiusX: 0.5,
+      radiusY: 0.5,
+      force: 0.5,
+      id,
+    };
+    const touch = new CdpTouchHandle(
+      this.#client,
+      this,
+      this.#keyboard,
+      touchPoint,
+    );
+    await touch.start();
+    this.touches.push(touch);
+    return touch;
   }
 }

package/front_end/third_party/puppeteer/package/src/cdp/IsolatedWorld.ts

@@ -33,6 +33,7 @@ import type {CdpWebWorker} from './WebWorker.js';
  */
 export interface PageBinding {
   name: string;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
   pptrFunction: Function;
 }
 
@@ -48,7 +49,7 @@ export interface IsolatedWorldChart {
 /**
  * @internal
  */
-type IsolatedWorldEmitter = EventEmitter<{
+export type IsolatedWorldEmitter = EventEmitter<{
   // Emitted when the isolated world gets a new execution context.
   context: ExecutionContext;
   // Emitted when the isolated world is disposed.
@@ -70,7 +71,7 @@ export class IsolatedWorld extends Realm {
 
   constructor(
     frameOrWorker: CdpFrame | CdpWebWorker,
-    timeoutSettings: TimeoutSettings
+    timeoutSettings: TimeoutSettings,
   ) {
     super(timeoutSettings);
     this.#frameOrWorker = frameOrWorker;
@@ -106,7 +107,7 @@ export class IsolatedWorld extends Realm {
   }
 
   #onContextConsoleApiCalled(
-    event: Protocol.Runtime.ConsoleAPICalledEvent
+    event: Protocol.Runtime.ConsoleAPICalledEvent,
   ): void {
     this.#emitter.emit('consoleapicalled', event);
   }
@@ -126,7 +127,7 @@ export class IsolatedWorld extends Realm {
   #executionContext(): ExecutionContext | undefined {
     if (this.disposed) {
       throw new Error(
-        `Execution context is not available in detached frame or worker "${this.environment.url()}" (are you trying to evaluate?)`
+        `Execution context is not available in detached frame or worker "${this.environment.url()}" (are you trying to evaluate?)`,
       );
     }
     return this.#context;
@@ -144,11 +145,11 @@ export class IsolatedWorld extends Realm {
             map(() => {
               // The message has to match the CDP message expected by the WaitTask class.
               throw error;
-            })
+            }),
           ),
-          timeout(this.timeoutSettings.timeout())
-        )
-      )
+          timeout(this.timeoutSettings.timeout()),
+        ),
+      ),
     );
     return result;
   }
@@ -162,7 +163,7 @@ export class IsolatedWorld extends Realm {
   ): Promise<HandleFor<Awaited<ReturnType<Func>>>> {
     pageFunction = withSourcePuppeteerURLIfNone(
       this.evaluateHandle.name,
-      pageFunction
+      pageFunction,
     );
     // This code needs to schedule evaluateHandle call synchroniously (at
     // least when the context is there) so we cannot unconditionally
@@ -183,7 +184,7 @@ export class IsolatedWorld extends Realm {
   ): Promise<Awaited<ReturnType<Func>>> {
     pageFunction = withSourcePuppeteerURLIfNone(
       this.evaluate.name,
-      pageFunction
+      pageFunction,
     );
     // This code needs to schedule evaluate call synchroniously (at
     // least when the context is there) so we cannot unconditionally
@@ -196,7 +197,7 @@ export class IsolatedWorld extends Realm {
   }
 
   override async adoptBackendNode(
-    backendNodeId?: Protocol.DOM.BackendNodeId
+    backendNodeId?: Protocol.DOM.BackendNodeId,
   ): Promise<JSHandle<Node>> {
     // This code needs to schedule resolveNode call synchroniously (at
     // least when the context is there) so we cannot unconditionally
@@ -238,7 +239,7 @@ export class IsolatedWorld extends Realm {
       objectId: handle.remoteObject().objectId,
     });
     const newHandle = (await this.adoptBackendNode(
-      info.node.backendNodeId
+      info.node.backendNodeId,
     )) as T;
     await handle.dispose();
     return newHandle;
@@ -248,7 +249,7 @@ export class IsolatedWorld extends Realm {
    * @internal
    */
   createCdpHandle(
-    remoteObject: Protocol.Runtime.RemoteObject
+    remoteObject: Protocol.Runtime.RemoteObject,
   ): JSHandle | ElementHandle<Node> {
     if (remoteObject.subtype === 'node') {
       return new CdpElementHandle(this, remoteObject);

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

@@ -24,7 +24,7 @@ export class CdpJSHandle<T = unknown> extends JSHandle<T> {
 
   constructor(
     world: IsolatedWorld,
-    remoteObject: Protocol.Runtime.RemoteObject
+    remoteObject: Protocol.Runtime.RemoteObject,
   ) {
     super();
     this.#world = world;
@@ -111,7 +111,7 @@ export class CdpJSHandle<T = unknown> extends JSHandle<T> {
  */
 export async function releaseObject(
   client: CDPSession,
-  remoteObject: Protocol.Runtime.RemoteObject
+  remoteObject: Protocol.Runtime.RemoteObject,
 ): Promise<void> {
   if (!remoteObject.objectId) {
     return;

package/front_end/third_party/puppeteer/package/src/cdp/LifecycleWatcher.ts

@@ -88,7 +88,7 @@ export class LifecycleWatcher {
     frame: CdpFrame,
     waitUntil: PuppeteerLifeCycleEvent | PuppeteerLifeCycleEvent[],
     timeout: number,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ) {
     if (Array.isArray(waitUntil)) {
       waitUntil = waitUntil.slice();
@@ -109,40 +109,40 @@ export class LifecycleWatcher {
     this.#frame = frame;
     this.#timeout = timeout;
     const frameManagerEmitter = this.#subscriptions.use(
-      new EventEmitter(frame._frameManager)
+      new EventEmitter(frame._frameManager),
     );
     frameManagerEmitter.on(
       FrameManagerEvent.LifecycleEvent,
-      this.#checkLifecycleComplete.bind(this)
+      this.#checkLifecycleComplete.bind(this),
     );
 
     const frameEmitter = this.#subscriptions.use(new EventEmitter(frame));
     frameEmitter.on(
       FrameEvent.FrameNavigatedWithinDocument,
-      this.#navigatedWithinDocument.bind(this)
+      this.#navigatedWithinDocument.bind(this),
     );
     frameEmitter.on(FrameEvent.FrameNavigated, this.#navigated.bind(this));
     frameEmitter.on(FrameEvent.FrameSwapped, this.#frameSwapped.bind(this));
     frameEmitter.on(
       FrameEvent.FrameSwappedByActivation,
-      this.#frameSwapped.bind(this)
+      this.#frameSwapped.bind(this),
     );
     frameEmitter.on(FrameEvent.FrameDetached, this.#onFrameDetached.bind(this));
 
     const networkManagerEmitter = this.#subscriptions.use(
-      new EventEmitter(networkManager)
+      new EventEmitter(networkManager),
     );
     networkManagerEmitter.on(
       NetworkManagerEvent.Request,
-      this.#onRequest.bind(this)
+      this.#onRequest.bind(this),
     );
     networkManagerEmitter.on(
       NetworkManagerEvent.Response,
-      this.#onResponse.bind(this)
+      this.#onResponse.bind(this),
     );
     networkManagerEmitter.on(
       NetworkManagerEvent.RequestFailed,
-      this.#onRequestFailed.bind(this)
+      this.#onRequestFailed.bind(this),
     );
 
     this.#terminationDeferred = Deferred.create<Error>({
@@ -185,7 +185,7 @@ export class LifecycleWatcher {
   #onFrameDetached(frame: Frame): void {
     if (this.#frame === frame) {
       this.#terminationDeferred.resolve(
-        new Error('Navigating frame was detached')
+        new Error('Navigating frame was detached'),
       );
       return;
     }
@@ -246,7 +246,7 @@ export class LifecycleWatcher {
 
     function checkLifecycle(
       frame: CdpFrame,
-      expectedLifecycle: ProtocolLifeCycleEvent[]
+      expectedLifecycle: ProtocolLifeCycleEvent[],
     ): boolean {
       for (const event of expectedLifecycle) {
         if (!frame._lifecycleEvents.has(event)) {

package/front_end/third_party/puppeteer/package/src/cdp/NetworkEventManager.ts

@@ -109,13 +109,13 @@ export class NetworkEventManager {
   }
 
   responseExtraInfo(
-    networkRequestId: NetworkRequestId
+    networkRequestId: NetworkRequestId,
   ): Protocol.Network.ResponseReceivedExtraInfoEvent[] {
     if (!this.#responseReceivedExtraInfoMap.has(networkRequestId)) {
       this.#responseReceivedExtraInfoMap.set(networkRequestId, []);
     }
     return this.#responseReceivedExtraInfoMap.get(
-      networkRequestId
+      networkRequestId,
     ) as Protocol.Network.ResponseReceivedExtraInfoEvent[];
   }
 
@@ -128,13 +128,13 @@ export class NetworkEventManager {
 
   queueRedirectInfo(
     fetchRequestId: FetchRequestId,
-    redirectInfo: RedirectInfo
+    redirectInfo: RedirectInfo,
   ): void {
     this.queuedRedirectInfo(fetchRequestId).push(redirectInfo);
   }
 
   takeQueuedRedirectInfo(
-    fetchRequestId: FetchRequestId
+    fetchRequestId: FetchRequestId,
   ): RedirectInfo | undefined {
     return this.queuedRedirectInfo(fetchRequestId).shift();
   }
@@ -151,13 +151,13 @@ export class NetworkEventManager {
 
   storeRequestWillBeSent(
     networkRequestId: NetworkRequestId,
-    event: Protocol.Network.RequestWillBeSentEvent
+    event: Protocol.Network.RequestWillBeSentEvent,
   ): void {
     this.#requestWillBeSentMap.set(networkRequestId, event);
   }
 
   getRequestWillBeSent(
-    networkRequestId: NetworkRequestId
+    networkRequestId: NetworkRequestId,
   ): Protocol.Network.RequestWillBeSentEvent | undefined {
     return this.#requestWillBeSentMap.get(networkRequestId);
   }
@@ -167,7 +167,7 @@ export class NetworkEventManager {
   }
 
   getRequestPaused(
-    networkRequestId: NetworkRequestId
+    networkRequestId: NetworkRequestId,
   ): Protocol.Fetch.RequestPausedEvent | undefined {
     return this.#requestPausedMap.get(networkRequestId);
   }
@@ -178,7 +178,7 @@ export class NetworkEventManager {
 
   storeRequestPaused(
     networkRequestId: NetworkRequestId,
-    event: Protocol.Fetch.RequestPausedEvent
+    event: Protocol.Fetch.RequestPausedEvent,
   ): void {
     this.#requestPausedMap.set(networkRequestId, event);
   }
@@ -189,7 +189,7 @@ export class NetworkEventManager {
 
   storeRequest(
     networkRequestId: NetworkRequestId,
-    request: CdpHTTPRequest
+    request: CdpHTTPRequest,
   ): void {
     this.#httpRequestsMap.set(networkRequestId, request);
   }
@@ -199,14 +199,14 @@ export class NetworkEventManager {
   }
 
   getQueuedEventGroup(
-    networkRequestId: NetworkRequestId
+    networkRequestId: NetworkRequestId,
   ): QueuedEventGroup | undefined {
     return this.#queuedEventGroupMap.get(networkRequestId);
   }
 
   queueEventGroup(
     networkRequestId: NetworkRequestId,
-    event: QueuedEventGroup
+    event: QueuedEventGroup,
   ): void {
     this.#queuedEventGroupMap.set(networkRequestId, event);
   }
@@ -234,19 +234,19 @@ export class NetworkEventManager {
     }
     console.log(
       'httpRequestsMap',
-      JSON.stringify(this.#httpRequestsMap, replacer, 2)
+      JSON.stringify(this.#httpRequestsMap, replacer, 2),
     );
     console.log(
       'requestWillBeSentMap',
-      JSON.stringify(this.#requestWillBeSentMap, replacer, 2)
+      JSON.stringify(this.#requestWillBeSentMap, replacer, 2),
     );
     console.log(
       'requestWillBeSentMap',
-      JSON.stringify(this.#responseReceivedExtraInfoMap, replacer, 2)
+      JSON.stringify(this.#responseReceivedExtraInfoMap, replacer, 2),
     );
     console.log(
       'requestWillBeSentMap',
-      JSON.stringify(this.#requestPausedMap, replacer, 2)
+      JSON.stringify(this.#requestPausedMap, replacer, 2),
     );
   }
 }