chrome-devtools-frontend 1.0.1630574 → 1.0.1632065

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

@@ -109,7 +109,7 @@ export class BidiFrame extends Frame {
       this.#createFrameTarget(browsingContext);
     }
 
-    this.browsingContext.on('browsingcontext', ({browsingContext}) => {
+    this.browsingContext.on('browsingcontext', browsingContext => {
       this.#createFrameTarget(browsingContext);
     });
     this.browsingContext.on('closed', () => {
@@ -121,7 +121,7 @@ export class BidiFrame extends Frame {
       this.page().trustedEmitter.emit(PageEvent.FrameDetached, this);
     });
 
-    this.browsingContext.on('request', ({request}) => {
+    this.browsingContext.on('request', request => {
       const httpRequest = BidiHTTPRequest.from(
         request,
         this,
@@ -137,7 +137,7 @@ export class BidiFrame extends Frame {
       void httpRequest.finalizeInterceptions();
     });
 
-    this.browsingContext.on('navigation', ({navigation}) => {
+    this.browsingContext.on('navigation', navigation => {
       navigation.once('fragment', () => {
         this.page().trustedEmitter.emit(PageEvent.FrameNavigated, this);
       });
@@ -151,14 +151,14 @@ export class BidiFrame extends Frame {
       this.page().trustedEmitter.emit(PageEvent.FrameNavigated, this);
     });
 
-    this.browsingContext.on('userprompt', ({userPrompt}) => {
+    this.browsingContext.on('userprompt', userPrompt => {
       this.page().trustedEmitter.emit(
         PageEvent.Dialog,
         BidiDialog.from(userPrompt),
       );
     });
 
-    this.browsingContext.on('log', ({entry}) => {
+    this.browsingContext.on('log', entry => {
       if (this._id !== entry.source.context) {
         return;
       }
@@ -204,7 +204,7 @@ export class BidiFrame extends Frame {
       }
     });
 
-    this.browsingContext.on('worker', ({realm}) => {
+    this.browsingContext.on('worker', realm => {
       const worker = BidiWebWorker.from(this, realm);
       realm.on('destroyed', () => {
         this.page().trustedEmitter.emit(PageEvent.WorkerDestroyed, worker);
@@ -363,13 +363,13 @@ export class BidiFrame extends Frame {
           fromEmitterEvent(this.browsingContext, 'navigation'),
           fromEmitterEvent(this.browsingContext, 'historyUpdated').pipe(
             map(() => {
-              return {navigation: null};
+              return null;
             }),
           ),
         )
           .pipe(first())
           .pipe(
-            switchMap(({navigation}) => {
+            switchMap(navigation => {
               if (navigation === null) {
                 return of(null);
               }

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

@@ -12,6 +12,7 @@ import {PageEvent} from '../api/Page.js';
 import {UnsupportedOperation} from '../common/Errors.js';
 import {SecurityDetails} from '../common/SecurityDetails.js';
 import {invokeAtMostOnceForArguments} from '../util/decorators.js';
+import {normalizeHeaderValue} from '../util/httpUtils.js';
 
 import type {BidiHTTPRequest} from './HTTPRequest.js';
 
@@ -100,7 +101,9 @@ export class BidiHTTPResponse extends HTTPResponse {
       // TODO: How to handle Binary Headers
       // https://w3c.github.io/webdriver-bidi/#type-network-Header
       if (header.value.type === 'string') {
-        headers[header.name.toLowerCase()] = header.value.value;
+        headers[header.name.toLowerCase()] = normalizeHeaderValue(
+          header.value.value,
+        );
       }
     }
     return headers;

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

@@ -918,7 +918,6 @@ export class BidiPage extends Page {
         // Chrome-specific properties.
         ...cdpSpecificCookiePropertiesFromPuppeteerToBidi(
           cookie,
-          'sameParty',
           'sourceScheme',
           'priority',
           'url',
@@ -1132,7 +1131,6 @@ export function bidiToPuppeteerCookie(
     // Extending with CDP-specific properties with `goog:` prefix.
     ...cdpSpecificCookiePropertiesFromBidiToPuppeteer(
       bidiCookie,
-      'sameParty',
       'sourceScheme',
       'partitionKeyOpaque',
       'priority',
@@ -1156,10 +1154,6 @@ function cdpSpecificCookiePropertiesFromBidiToPuppeteer(
       result[property] = bidiCookie[CDP_SPECIFIC_PREFIX + property];
     }
   }
-  // TODO: remove once deprecated sameParty attribute is dropped.
-  if (!result.sameParty) {
-    result.sameParty = false;
-  }
   return result;
 }
 

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

@@ -59,7 +59,7 @@ export abstract class BidiRealm extends Realm {
   }
 
   protected initialize(): void {
-    this.realm.on('destroyed', ({reason}) => {
+    this.realm.on('destroyed', reason => {
       this.taskManager.terminateAll(new Error(reason));
       this.dispose();
     });

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

@@ -32,20 +32,11 @@ export type AddPreloadScriptOptions = Omit<
  */
 export class Browser extends EventEmitter<{
   /** Emitted before the browser closes. */
-  closed: {
-    /** The reason for closing the browser. */
-    reason: string;
-  };
+  closed: string;
   /** Emitted after the browser disconnects. */
-  disconnected: {
-    /** The reason for disconnecting the browser. */
-    reason: string;
-  };
+  disconnected: string;
   /** Emitted when a shared worker is created. */
-  sharedworker: {
-    /** The realm of the shared worker. */
-    realm: SharedWorkerRealm;
-  };
+  sharedworker: SharedWorkerRealm;
 }> {
   static async from(session: Session): Promise<Browser> {
     const browser = new Browser(session);
@@ -70,7 +61,7 @@ export class Browser extends EventEmitter<{
     const sessionEmitter = this.#disposables.use(
       new EventEmitter(this.session),
     );
-    sessionEmitter.once('ended', ({reason}) => {
+    sessionEmitter.once('ended', reason => {
       this.dispose(reason);
     });
 
@@ -320,9 +311,9 @@ export class Browser extends EventEmitter<{
     this.#reason ??=
       'Browser was disconnected, probably because the session ended.';
     if (this.closed) {
-      this.emit('closed', {reason: this.#reason});
+      this.emit('closed', this.#reason);
     }
-    this.emit('disconnected', {reason: this.#reason});
+    this.emit('disconnected', this.#reason);
 
     this.#disposables.dispose();
     super[disposeSymbol]();

package/front_end/third_party/puppeteer/package/src/bidi/core/BrowsingContext.ts

@@ -91,37 +91,19 @@ export type SetGeoLocationOverrideOptions =
  */
 export class BrowsingContext extends EventEmitter<{
   /** Emitted when this context is closed. */
-  closed: {
-    /** The reason the browsing context was closed */
-    reason: string;
-  };
+  closed: string;
   /** Emitted when a child browsing context is created. */
-  browsingcontext: {
-    /** The newly created child browsing context. */
-    browsingContext: BrowsingContext;
-  };
+  browsingcontext: BrowsingContext;
   /** Emitted whenever a navigation occurs. */
-  navigation: {
-    /** The navigation that occurred. */
-    navigation: Navigation;
-  };
+  navigation: Navigation;
   /** Emitted whenever a file dialog is opened occurs. */
   filedialogopened: Bidi.Input.FileDialogInfo;
   /** Emitted whenever a request is made. */
-  request: {
-    /** The request that was made. */
-    request: Request;
-  };
+  request: Request;
   /** Emitted whenever a log entry is added. */
-  log: {
-    /** Entry added to the log. */
-    entry: Bidi.Log.Entry;
-  };
+  log: Bidi.Log.Entry;
   /** Emitted whenever a prompt is opened. */
-  userprompt: {
-    /** The prompt that was opened. */
-    userPrompt: UserPrompt;
-  };
+  userprompt: UserPrompt;
   /** Emitted whenever the frame history is updated. */
   historyUpdated: void;
   /** Emitted whenever the frame emits `DOMContentLoaded` */
@@ -129,10 +111,7 @@ export class BrowsingContext extends EventEmitter<{
   /** Emitted whenever the frame emits `load` */
   load: void;
   /** Emitted whenever a dedicated worker is created */
-  worker: {
-    /** The realm for the new dedicated worker */
-    realm: DedicatedWorkerRealm;
-  };
+  worker: DedicatedWorkerRealm;
 }> {
   static from(
     userContext: UserContext,
@@ -162,7 +141,6 @@ export class BrowsingContext extends EventEmitter<{
   readonly #children = new Map<string, BrowsingContext>();
   readonly #disposables = new DisposableStack();
   readonly #realms = new Map<string, WindowRealm>();
-  readonly #requests = new Map<string, Request>();
   readonly defaultRealm: WindowRealm;
   readonly id: string;
   readonly parent: BrowsingContext | undefined;
@@ -207,7 +185,7 @@ export class BrowsingContext extends EventEmitter<{
     const userContextEmitter = this.#disposables.use(
       new EventEmitter(this.userContext),
     );
-    userContextEmitter.once('closed', ({reason}) => {
+    userContextEmitter.once('closed', reason => {
       this.dispose(`Browsing context already closed: ${reason}`);
     });
 
@@ -244,7 +222,7 @@ export class BrowsingContext extends EventEmitter<{
         this.#children.delete(browsingContext.id);
       });
 
-      this.emit('browsingcontext', {browsingContext});
+      this.emit('browsingcontext', browsingContext);
     });
     sessionEmitter.on('browsingContext.contextDestroyed', info => {
       if (info.context !== this.id) {
@@ -284,11 +262,6 @@ export class BrowsingContext extends EventEmitter<{
       // Note: we should not update this.#url at this point since the context
       // has not finished navigating to the info.url yet.
 
-      for (const [id, request] of this.#requests) {
-        if (request.disposed) {
-          this.#requests.delete(id);
-        }
-      }
       // If the navigation hasn't finished, then this is nested navigation. The
       // current navigation will handle this.
       if (this.#navigation !== undefined && !this.#navigation.disposed) {
@@ -309,21 +282,20 @@ export class BrowsingContext extends EventEmitter<{
         });
       }
 
-      this.emit('navigation', {navigation: this.#navigation});
+      this.emit('navigation', this.#navigation);
     });
     sessionEmitter.on('network.beforeRequestSent', event => {
       if (event.context !== this.id) {
         return;
       }
-      if (this.#requests.has(event.request.request)) {
+      if (event.redirectCount > 0) {
         // Means the request is a redirect. This is handled in Request.
         // Or an Auth event was issued
         return;
       }
 
       const request = Request.from(this, event);
-      this.#requests.set(request.id, request);
-      this.emit('request', {request});
+      this.emit('request', request);
     });
 
     sessionEmitter.on('log.entryAdded', entry => {
@@ -331,7 +303,7 @@ export class BrowsingContext extends EventEmitter<{
         return;
       }
 
-      this.emit('log', {entry});
+      this.emit('log', entry);
     });
 
     sessionEmitter.on('browsingContext.userPromptOpened', info => {
@@ -340,7 +312,7 @@ export class BrowsingContext extends EventEmitter<{
       }
 
       const userPrompt = UserPrompt.from(this, info);
-      this.emit('userprompt', {userPrompt});
+      this.emit('userprompt', userPrompt);
     });
   }
 
@@ -378,7 +350,7 @@ export class BrowsingContext extends EventEmitter<{
   #createWindowRealm(sandbox?: string) {
     const realm = WindowRealm.from(this, sandbox);
     realm.on('worker', realm => {
-      this.emit('worker', {realm});
+      this.emit('worker', realm);
     });
     return realm;
   }
@@ -714,7 +686,7 @@ export class BrowsingContext extends EventEmitter<{
   override [disposeSymbol](): void {
     this.#reason ??=
       'Browsing context already closed, probably because the user context closed.';
-    this.emit('closed', {reason: this.#reason});
+    this.emit('closed', this.#reason);
 
     this.#disposables.dispose();
     super[disposeSymbol]();

package/front_end/third_party/puppeteer/package/src/bidi/core/Navigation.ts

@@ -62,7 +62,7 @@ export class Navigation extends EventEmitter<{
       this.dispose();
     });
 
-    browsingContextEmitter.on('request', ({request}) => {
+    browsingContextEmitter.on('request', request => {
       if (
         request.navigation === undefined ||
         // If a request with a navigation ID comes in, then the navigation ID is

package/front_end/third_party/puppeteer/package/src/bidi/core/Realm.ts

@@ -38,7 +38,7 @@ export abstract class Realm extends EventEmitter<{
   /** Emitted whenever the realm has updated. */
   updated: Realm;
   /** Emitted when the realm is destroyed. */
-  destroyed: {reason: string};
+  destroyed: string;
   /** Emitted when a dedicated worker is created in the realm. */
   worker: DedicatedWorkerRealm;
   /** Emitted when a shared worker is created in the realm. */
@@ -139,7 +139,7 @@ export abstract class Realm extends EventEmitter<{
   override [disposeSymbol](): void {
     this.#reason ??=
       'Realm already destroyed, probably because all associated browsing contexts closed.';
-    this.emit('destroyed', {reason: this.#reason});
+    this.emit('destroyed', this.#reason);
 
     this.disposables.dispose();
     super[disposeSymbol]();
@@ -172,7 +172,7 @@ export class WindowRealm extends Realm {
     const browsingContextEmitter = this.disposables.use(
       new EventEmitter(this.browsingContext),
     );
-    browsingContextEmitter.on('closed', ({reason}) => {
+    browsingContextEmitter.on('closed', reason => {
       this.dispose(reason);
     });
 

package/front_end/third_party/puppeteer/package/src/bidi/core/Request.ts

@@ -62,9 +62,9 @@ export class Request extends EventEmitter<{
     const browsingContextEmitter = this.#disposables.use(
       new EventEmitter(this.#browsingContext),
     );
-    browsingContextEmitter.once('closed', ({reason}) => {
+    browsingContextEmitter.once('closed', reason => {
       this.#error = reason;
-      this.emit('error', this.#error);
+      this.emit('error', reason);
       this.dispose();
     });
 

package/front_end/third_party/puppeteer/package/src/bidi/core/Session.ts

@@ -21,8 +21,8 @@ import type {BidiEvents, Commands, Connection} from './Connection.js';
  * @internal
  */
 export class Session
-  extends EventEmitter<BidiEvents & {ended: {reason: string}}>
-  implements Connection<BidiEvents & {ended: {reason: string}}>
+  extends EventEmitter<BidiEvents & {ended: string}>
+  implements Connection<BidiEvents & {ended: string}>
 {
   static async from(
     connection: Connection,
@@ -56,7 +56,7 @@ export class Session
     (this as any).browser = await Browser.from(this);
 
     const browserEmitter = this.#disposables.use(this.browser);
-    browserEmitter.once('closed', ({reason}) => {
+    browserEmitter.once('closed', reason => {
       this.dispose(reason);
     });
 
@@ -154,7 +154,7 @@ export class Session
   override [disposeSymbol](): void {
     this.#reason ??=
       'Session already destroyed, probably because the connection broke.';
-    this.emit('ended', {reason: this.#reason});
+    this.emit('ended', this.#reason);
 
     this.#disposables.dispose();
     super[disposeSymbol]();

package/front_end/third_party/puppeteer/package/src/bidi/core/UserContext.ts

@@ -33,17 +33,11 @@ export class UserContext extends EventEmitter<{
   /**
    * Emitted when a new browsing context is created.
    */
-  browsingcontext: {
-    /** The new browsing context. */
-    browsingContext: BrowsingContext;
-  };
+  browsingcontext: BrowsingContext;
   /**
    * Emitted when the user context is closed.
    */
-  closed: {
-    /** The reason the user context was closed. */
-    reason: string;
-  };
+  closed: string;
 }> {
   static DEFAULT = 'default' as const;
 
@@ -71,10 +65,10 @@ export class UserContext extends EventEmitter<{
     const browserEmitter = this.#disposables.use(
       new EventEmitter(this.browser),
     );
-    browserEmitter.once('closed', ({reason}) => {
+    browserEmitter.once('closed', reason => {
       this.dispose(`User context was closed: ${reason}`);
     });
-    browserEmitter.once('disconnected', ({reason}) => {
+    browserEmitter.once('disconnected', reason => {
       this.dispose(`User context was closed: ${reason}`);
     });
 
@@ -109,7 +103,7 @@ export class UserContext extends EventEmitter<{
         this.#browsingContexts.delete(browsingContext.id);
       });
 
-      this.emit('browsingcontext', {browsingContext});
+      this.emit('browsingcontext', browsingContext);
     });
   }
 
@@ -236,7 +230,7 @@ export class UserContext extends EventEmitter<{
   override [disposeSymbol](): void {
     this.#reason ??=
       'User context already closed, probably because the browser disconnected/closed.';
-    this.emit('closed', {reason: this.#reason});
+    this.emit('closed', this.#reason);
 
     this.#disposables.dispose();
     super[disposeSymbol]();

package/front_end/third_party/puppeteer/package/src/bidi/core/UserPrompt.ts

@@ -35,10 +35,7 @@ export class UserPrompt extends EventEmitter<{
   /** Emitted when the user prompt is handled. */
   handled: UserPromptResult;
   /** Emitted when the user prompt is closed. */
-  closed: {
-    /** The reason the user prompt was closed. */
-    reason: string;
-  };
+  closed: string;
 }> {
   static from(
     browsingContext: BrowsingContext,
@@ -69,7 +66,7 @@ export class UserPrompt extends EventEmitter<{
     const browserContextEmitter = this.#disposables.use(
       new EventEmitter(this.browsingContext),
     );
-    browserContextEmitter.once('closed', ({reason}) => {
+    browserContextEmitter.once('closed', reason => {
       this.dispose(`User prompt already closed: ${reason}`);
     });
 
@@ -130,7 +127,7 @@ export class UserPrompt extends EventEmitter<{
   override [disposeSymbol](): void {
     this.#reason ??=
       'User prompt already closed, probably because the associated browsing context was destroyed.';
-    this.emit('closed', {reason: this.#reason});
+    this.emit('closed', this.#reason);
 
     this.#disposables.dispose();
     super[disposeSymbol]();

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

@@ -151,6 +151,10 @@ export class CdpBrowser extends BrowserBase {
       });
     this.#handleDevToolsAsPage = handleDevToolsAsPage;
     this.#setIsPageTargetCallback(isPageTargetCallback);
+    connection.rejectEmulateNetworkConditionsCalls = Boolean(
+      (blocklist && blocklist.length > 0) ||
+      (allowlist && allowlist.length > 0),
+    );
     this.#targetManager = new TargetManager(
       connection,
       this.#createTarget,

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

@@ -66,7 +66,7 @@ export class CdpBrowserContext extends BrowserContext {
           return target.page();
         }),
     );
-    return pages.filter((page): page is Page => {
+    return pages.filter(page => {
       return !!page;
     });
   }
@@ -150,8 +150,6 @@ export class CdpBrowserContext extends BrowserContext {
               hasCrossSiteAncestor: cookie.partitionKey.hasCrossSiteAncestor,
             }
           : undefined,
-        // TODO: remove sameParty as it is removed from Chrome.
-        sameParty: false,
       };
     });
   }

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

@@ -101,15 +101,21 @@ export class CdpCDPSession extends CDPSession {
         ),
       );
     }
-    return this.#connection._rawSend(
-      this.#callbacks,
-      method,
-      params,
-      this.#sessionId,
-      options,
-    );
+    return this.#connection
+      ._rawSend(this.#callbacks, method, params, this.#sessionId, options)
+      .catch(error => {
+        if (
+          error instanceof Error &&
+          error.message.includes('Session with given id not found')
+        ) {
+          this.onClosed();
+          throw new TargetCloseError(
+            `Protocol error (${method}): Session with given id not found.`,
+          );
+        }
+        throw error;
+      });
   }
-
   /**
    * @internal
    */
@@ -172,6 +178,13 @@ export class CdpCDPSession extends CDPSession {
     return this.#sessionId;
   }
 
+  /**
+   * @internal
+   */
+  hasCallback(id: number): boolean {
+    return this.#callbacks.has(id);
+  }
+
   /**
    * @internal
    */

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

@@ -40,6 +40,7 @@ export class Connection extends EventEmitter<CDPSessionEvents> {
   #sessions = new Map<string, CdpCDPSession>();
   #closed = false;
   #manuallyAttached = new Set<string>();
+  #rejectEmulateNetworkConditionsCalls = false;
   #callbacks: CallbackRegistry;
   #rawErrors = false;
   #idGenerator: GetIdFn;
@@ -80,6 +81,17 @@ export class Connection extends EventEmitter<CDPSessionEvents> {
     return this.#timeout;
   }
 
+  /**
+   * @internal
+   */
+  get rejectEmulateNetworkConditionsCalls(): boolean {
+    return this.#rejectEmulateNetworkConditionsCalls;
+  }
+
+  set rejectEmulateNetworkConditionsCalls(value: boolean) {
+    this.#rejectEmulateNetworkConditionsCalls = value;
+  }
+
   /**
    * @internal
    */
@@ -147,6 +159,16 @@ export class Connection extends EventEmitter<CDPSessionEvents> {
     if (this.#closed) {
       return Promise.reject(new ConnectionClosedError('Connection closed.'));
     }
+    if (
+      method === 'Network.emulateNetworkConditions' &&
+      this.rejectEmulateNetworkConditionsCalls
+    ) {
+      return Promise.reject(
+        new Error(
+          'Cannot reset network conditions: rule-based emulation is enabled.',
+        ),
+      );
+    }
     return callbacks.create(method, options?.timeout ?? this.#timeout, id => {
       const stringifiedMessage = JSON.stringify({
         method,
@@ -210,18 +232,27 @@ export class Connection extends EventEmitter<CDPSessionEvents> {
         session.onMessage(object);
       }
     } else if (object.id) {
-      if (object.error) {
-        if (this.#rawErrors) {
-          this.#callbacks.rejectRaw(object.id, object.error);
+      if (this.#callbacks.has(object.id)) {
+        if (object.error) {
+          if (this.#rawErrors) {
+            this.#callbacks.rejectRaw(object.id, object.error);
+          } else {
+            this.#callbacks.reject(
+              object.id,
+              createProtocolErrorMessage(object),
+              object.error.message,
+            );
+          }
         } else {
-          this.#callbacks.reject(
-            object.id,
-            createProtocolErrorMessage(object),
-            object.error.message,
-          );
+          this.#callbacks.resolve(object.id, object.result);
         }
       } else {
-        this.#callbacks.resolve(object.id, object.result);
+        for (const session of this.#sessions.values()) {
+          if (session.hasCallback(object.id)) {
+            session.onMessage(object);
+            break;
+          }
+        }
       }
     } else {
       this.emit(object.method, object.params);

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

@@ -11,6 +11,7 @@ import {ProtocolError} from '../common/Errors.js';
 import {SecurityDetails} from '../common/SecurityDetails.js';
 import {Deferred} from '../util/Deferred.js';
 import {stringToTypedArray} from '../util/encoding.js';
+import {normalizeHeaderValue} from '../util/httpUtils.js';
 
 import type {CdpHTTPRequest} from './HTTPRequest.js';
 
@@ -51,7 +52,7 @@ export class CdpHTTPResponse extends HTTPResponse {
     this.#status = extraInfo ? extraInfo.statusCode : responsePayload.status;
     const headers = extraInfo ? extraInfo.headers : responsePayload.headers;
     for (const [key, value] of Object.entries(headers)) {
-      this.#headers[key.toLowerCase()] = value;
+      this.#headers[key.toLowerCase()] = normalizeHeaderValue(value);
     }
 
     this.#securityDetails = responsePayload.securityDetails