chrome-devtools-frontend 1.0.1650232 → 1.0.1651641

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

@@ -7,7 +7,7 @@ import type {Protocol} from 'devtools-protocol';
 
 import {type CDPSession, CDPSessionEvent} from '../api/CDPSession.js';
 import type {GeolocationOptions, MediaFeature} from '../api/Page.js';
-import {debugError} from '../common/util.js';
+import {debugError, debugCatchError} from '../common/util.js';
 import type {Viewport} from '../common/Viewport.js';
 import {assert} from '../util/assert.js';
 import {invokeAtMostOnceForArguments} from '../util/decorators.js';
@@ -31,6 +31,11 @@ interface TimezoneState {
   active: boolean;
 }
 
+interface LocaleState {
+  locale?: string;
+  active: boolean;
+}
+
 interface VisionDeficiencyState {
   visionDeficiency?: Protocol.Emulation.SetEmulatedVisionDeficiencyRequest['type'];
   active: boolean;
@@ -148,6 +153,13 @@ export class EmulationManager implements ClientProvider {
     this,
     this.#emulateTimezone,
   );
+  #localeState = new EmulatedState<LocaleState>(
+    {
+      active: false,
+    },
+    this,
+    this.#emulateLocale,
+  );
   #visionDeficiencyState = new EmulatedState<VisionDeficiencyState>(
     {
       active: false,
@@ -235,7 +247,7 @@ export class EmulationManager implements ClientProvider {
     // the target is unpaused.
     void Promise.all(
       this.#states.map(s => {
-        return s.sync().catch(debugError);
+        return s.sync().catch(debugCatchError);
       }),
     );
   }
@@ -281,7 +293,7 @@ export class EmulationManager implements ClientProvider {
         client.send('Emulation.setTouchEmulationEnabled', {
           enabled: false,
         }),
-      ]).catch(debugError);
+      ]).catch(debugCatchError);
       return;
     }
     const {viewport} = viewportState;
@@ -308,7 +320,7 @@ export class EmulationManager implements ClientProvider {
           if (
             err.message.includes('Target does not support metrics override')
           ) {
-            debugError(err);
+            debugError?.(err);
             return;
           }
           throw err;
@@ -374,6 +386,26 @@ export class EmulationManager implements ClientProvider {
     });
   }
 
+  @invokeAtMostOnceForArguments
+  async #emulateLocale(
+    client: CDPSession,
+    localeState: LocaleState,
+  ): Promise<void> {
+    if (!localeState.active) {
+      return;
+    }
+    await client.send('Emulation.setLocaleOverride', {
+      locale: localeState.locale,
+    });
+  }
+
+  async emulateLocale(locale?: string): Promise<void> {
+    await this.#localeState.setState({
+      locale,
+      active: true,
+    });
+  }
+
   @invokeAtMostOnceForArguments
   async #emulateVisionDeficiency(
     client: CDPSession,

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

@@ -159,7 +159,7 @@ export class ExecutionContext
         }
       }
 
-      debugError(error);
+      debugError?.(error);
     }
   }
 
@@ -192,7 +192,7 @@ export class ExecutionContext
       const binding = this.#bindings.get(name);
       await binding?.run(this, seq, args, isTrivial);
     } catch (err) {
-      debugError(err);
+      debugError?.(err);
     }
   }
 
@@ -239,7 +239,7 @@ export class ExecutionContext
     } catch (err) {
       // If the binding cannot be added, the context is broken. We cannot
       // recover so we ignore the error.
-      debugError(err);
+      debugError?.(err);
     }
   }
 

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

@@ -41,24 +41,23 @@ export class CdpExtension extends Extension {
       );
     });
 
-    const workers: WebWorker[] = [];
-    for (const target of extensionWorkers) {
-      try {
-        const worker = await target.worker();
-
-        if (worker) {
-          workers.push(worker);
-        }
-      } catch (err) {
-        if (this.#canIgnoreError(err)) {
-          debugError(err);
-          continue;
+    const workers = await Promise.all(
+      extensionWorkers.map(async target => {
+        try {
+          return await target.worker();
+        } catch (err) {
+          if (this.#canIgnoreError(err)) {
+            debugError?.(err);
+            return null;
+          }
+          throw err;
         }
-        throw err;
-      }
-    }
+      }),
+    );
 
-    return workers;
+    return workers.filter((worker): worker is WebWorker => {
+      return worker !== null;
+    });
   }
 
   async pages(): Promise<Page[]> {
@@ -78,7 +77,7 @@ export class CdpExtension extends Extension {
           return await target.asPage();
         } catch (err) {
           if (this.#canIgnoreError(err)) {
-            debugError(err);
+            debugError?.(err);
             return null;
           }
           throw err;

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

@@ -14,7 +14,7 @@ import {Frame, FrameEvent, throwIfDetached} from '../api/Frame.js';
 import type {HTTPResponse} from '../api/HTTPResponse.js';
 import type {WaitTimeoutOptions} from '../api/Page.js';
 import {UnsupportedOperation} from '../common/Errors.js';
-import {debugError} from '../common/util.js';
+import {debugCatchError} from '../common/util.js';
 import type {Realm} from '../puppeteer-core.js';
 import {Deferred} from '../util/Deferred.js';
 import {disposeSymbol} from '../util/disposable.js';
@@ -351,7 +351,7 @@ export class CdpFrame extends Frame {
       this.#client.send('Runtime.addBinding', {
         name: CDP_BINDING_PREFIX + binding.name,
       }),
-      this.evaluate(binding.initSource).catch(debugError),
+      this.evaluate(binding.initSource).catch(debugCatchError),
     ]);
   }
 
@@ -370,7 +370,7 @@ export class CdpFrame extends Frame {
         // Removes the dangling Puppeteer binding wrapper.
         // @ts-expect-error: In a different context.
         globalThis[name] = undefined;
-      }, binding.name).catch(debugError),
+      }, binding.name).catch(debugCatchError),
     ]);
   }
 

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

@@ -11,7 +11,12 @@ import {FrameEvent} from '../api/Frame.js';
 import {PageEvent, type NewDocumentScriptEvaluation} from '../api/Page.js';
 import {EventEmitter} from '../common/EventEmitter.js';
 import type {TimeoutSettings} from '../common/TimeoutSettings.js';
-import {debugError, PuppeteerURL, UTILITY_WORLD_NAME} from '../common/util.js';
+import {
+  debugError,
+  PuppeteerURL,
+  UTILITY_WORLD_NAME,
+  debugCatchError,
+} from '../common/util.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
 import {disposeSymbol} from '../util/disposable.js';
@@ -93,7 +98,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
     this.#timeoutSettings = timeoutSettings;
     this.setupEventListeners(this.#client);
     client.once(CDPSessionEvent.Disconnected, () => {
-      this.#onClientDisconnect().catch(debugError);
+      void this.#onClientDisconnect().catch(debugCatchError);
     });
   }
 
@@ -149,7 +154,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
     }
     this.setupEventListeners(client);
     client.once(CDPSessionEvent.Disconnected, () => {
-      this.#onClientDisconnect().catch(debugError);
+      void this.#onClientDisconnect().catch(debugCatchError);
     });
     await this.initialize(client, frame);
     await this.#networkManager.addClient(client);
@@ -331,7 +336,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
           .send('Page.removeScriptToEvaluateOnNewDocument', {
             identifier,
           })
-          .catch(debugError);
+          .catch(debugCatchError);
       }),
     );
   }
@@ -346,7 +351,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
       frame.updateClient(target._session()!);
     }
     this.setupEventListeners(target._session()!);
-    void this.initialize(target._session()!, frame).catch(debugError);
+    void this.initialize(target._session()!, frame).catch(debugCatchError);
   }
 
   _deviceRequestPromptManager(
@@ -500,7 +505,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
               worldName: name,
               grantUniveralAccess: true,
             })
-            .catch(debugError);
+            .catch(debugCatchError);
         }),
     );
 
@@ -583,7 +588,7 @@ export class FrameManager extends EventEmitter<FrameManagerEvents> {
         const extId = this.#extractExtensionId(origin);
 
         if (!extId) {
-          debugError('Error while parsing extension id');
+          debugError?.('Error while parsing extension id');
           return;
         }
 

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

@@ -157,7 +157,7 @@ export class CdpHTTPRequest extends HTTPRequest {
       });
       return result.postData;
     } catch (err) {
-      debugError(err);
+      debugError?.(err);
       return;
     }
   }

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

@@ -121,6 +121,6 @@ export async function releaseObject(
     .catch(error => {
       // Exceptions might happen in case of a page been navigated or closed.
       // Swallow these since they are harmless and we don't leak anything in this case.
-      debugError(error);
+      debugError?.(error);
     });
 }

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

@@ -8,13 +8,13 @@ import type {Protocol} from 'devtools-protocol';
 
 import {CDPSessionEvent, type CDPSession} from '../api/CDPSession.js';
 import type {Frame} from '../api/Frame.js';
-import type {Credentials} from '../api/Page.js';
+import type {Credentials, Page} from '../api/Page.js';
 import {EventEmitter} from '../common/EventEmitter.js';
 import {
   NetworkManagerEvent,
   type NetworkManagerEvents,
 } from '../common/NetworkManagerEvents.js';
-import {debugError, isString} from '../common/util.js';
+import {debugError, isString, debugCatchError} from '../common/util.js';
 import {assert} from '../util/assert.js';
 import {DisposableStack} from '../util/disposable.js';
 import {isErrorLike} from '../util/ErrorLike.js';
@@ -65,6 +65,7 @@ export interface InternalNetworkConditions extends NetworkConditions {
  */
 export interface FrameProvider {
   frame(id: string): Frame | null;
+  page(): Page;
 }
 
 /**
@@ -83,6 +84,7 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
   #userAgent?: string;
   #userAgentMetadata?: Protocol.Emulation.UserAgentMetadata;
   #platform?: string;
+  #acceptLanguage?: string;
 
   readonly #handlers = [
     ['Fetch.requestPaused', this.#onRequestPaused],
@@ -98,7 +100,7 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
   ] as const;
 
   #clients = new Map<CDPSession, DisposableStack>();
-  #networkEnabled = true;
+  #networkEnabled: boolean;
 
   constructor(frameManager: FrameProvider, networkEnabled?: boolean) {
     super();
@@ -277,13 +279,22 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
     await this.#applyToAllClients(this.#applyUserAgent.bind(this));
   }
 
+  async setAcceptLanguage(acceptLanguage: string | undefined): Promise<void> {
+    this.#acceptLanguage = acceptLanguage;
+    await this.#applyToAllClients(this.#applyUserAgent.bind(this));
+  }
+
   async #applyUserAgent(client: CDPSession) {
-    if (this.#userAgent === undefined) {
+    const userAgent =
+      this.#userAgent ??
+      (await this.#frameManager.page().browser().userAgent());
+    if (userAgent === undefined) {
       return;
     }
     try {
       await client.send('Network.setUserAgentOverride', {
-        userAgent: this.#userAgent,
+        userAgent,
+        acceptLanguage: this.#acceptLanguage,
         userAgentMetadata: this.#userAgentMetadata,
         platform: this.#platform,
       });
@@ -403,12 +414,12 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
       username: undefined,
       password: undefined,
     };
-    client
+    void client
       .send('Fetch.continueWithAuth', {
         requestId: event.requestId,
         authChallengeResponse: {response, username, password},
       })
-      .catch(debugError);
+      .catch(debugCatchError);
   }
 
   /**
@@ -426,11 +437,11 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
       !this.#userRequestInterceptionEnabled &&
       this.#protocolRequestInterceptionEnabled
     ) {
-      client
+      void client
         .send('Fetch.continueRequest', {
           requestId: event.requestId,
         })
-        .catch(debugError);
+        .catch(debugCatchError);
     }
 
     const {networkId: networkRequestId, requestId: fetchRequestId} = event;
@@ -602,7 +613,7 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
       request = this.#networkEventManager.getRequest(event.requestId);
     }
     if (!request) {
-      debugError(
+      debugError?.(
         new Error(
           `Request ${event.requestId} was served from cache but we could not find the corresponding request object`,
         ),
@@ -646,7 +657,7 @@ export class NetworkManager extends EventEmitter<NetworkManagerEvents> {
       responseReceived.requestId,
     );
     if (extraInfos.length) {
-      debugError(
+      debugError?.(
         new Error(
           'Unexpected extraInfo events for request ' +
             responseReceived.requestId,

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

@@ -56,6 +56,7 @@ import {
   parsePDFOptions,
   timeout,
   validateDialogType,
+  debugCatchError,
 } from '../common/util.js';
 import type {Viewport} from '../common/Viewport.js';
 import {environment} from '../environment.js';
@@ -126,7 +127,7 @@ export class CdpPage extends Page {
         await page.setViewport(defaultViewport);
       } catch (err) {
         if (isErrorLike(err) && isTargetClosedError(err)) {
-          debugError(err);
+          debugError?.(err);
         } else {
           throw err;
         }
@@ -246,7 +247,7 @@ export class CdpPage extends Page {
       this.#onDetachedFromTarget,
     );
 
-    this.#tabTarget._isClosedDeferred
+    void this.#tabTarget._isClosedDeferred
       .valueOrThrow()
       .then(() => {
         this.#targetManager.off(
@@ -257,7 +258,7 @@ export class CdpPage extends Page {
         this.emit(PageEvent.Close, undefined);
         this.#closed = true;
       })
-      .catch(debugError);
+      .catch(debugCatchError);
 
     this.#setupPrimaryTargetListeners();
     this.#attachExistingTargets();
@@ -309,10 +310,12 @@ export class CdpPage extends Page {
     if (session.target()._subtype() !== 'prerender') {
       return;
     }
-    this.#frameManager.registerSpeculativeSession(session).catch(debugError);
-    this.#emulationManager
+    void this.#frameManager
       .registerSpeculativeSession(session)
-      .catch(debugError);
+      .catch(debugCatchError);
+    void this.#emulationManager
+      .registerSpeculativeSession(session)
+      .catch(debugCatchError);
   }
 
   /**
@@ -378,7 +381,7 @@ export class CdpPage extends Page {
           // eslint-disable-next-line max-len -- The comment is long.
           // eslint-disable-next-line @puppeteer/use-using -- These are not owned by this function.
           for (const arg of message.args()) {
-            void arg.dispose().catch(debugError);
+            void arg.dispose().catch(debugCatchError);
           }
           return;
         }
@@ -402,7 +405,7 @@ export class CdpPage extends Page {
       ]);
     } catch (err) {
       if (isErrorLike(err) && isTargetClosedError(err)) {
-        debugError(err);
+        debugError?.(err);
       } else {
         throw err;
       }
@@ -950,7 +953,7 @@ export class CdpPage extends Page {
         // eslint-disable-next-line max-len -- The comment is long.
         // eslint-disable-next-line @puppeteer/use-using -- These are not owned by this function.
         for (const value of values) {
-          void value.dispose().catch(debugError);
+          void value.dispose().catch(debugCatchError);
         }
       }
       return;
@@ -1085,6 +1088,11 @@ export class CdpPage extends Page {
     return await this.#emulationManager.emulateTimezone(timezoneId);
   }
 
+  override async emulateLocale(locale?: string): Promise<void> {
+    await this.#emulationManager.emulateLocale(locale);
+    await this.#frameManager.networkManager.setAcceptLanguage(locale);
+  }
+
   override async emulateIdleState(overrides?: {
     isUserActive: boolean;
     isScreenUnlocked: boolean;
@@ -1152,7 +1160,7 @@ export class CdpPage extends Page {
       stack.defer(async () => {
         await this.#emulationManager
           .resetDefaultBackgroundColor()
-          .catch(debugError);
+          .catch(debugCatchError);
       });
     }
 

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

@@ -10,7 +10,7 @@ import type {Browser} from '../api/Browser.js';
 import type {BrowserContext} from '../api/BrowserContext.js';
 import {PageEvent, type Page} from '../api/Page.js';
 import {Target, TargetType} from '../api/Target.js';
-import {debugError} from '../common/util.js';
+import {debugCatchError} from '../common/util.js';
 import type {Viewport} from '../common/Viewport.js';
 import {Deferred} from '../util/Deferred.js';
 
@@ -233,7 +233,7 @@ export class PageTarget extends CdpTarget {
   }
 
   override _initialize(): void {
-    this._initializedDeferred
+    void this._initializedDeferred
       .valueOrThrow()
       .then(async result => {
         if (result === InitializationStatus.ABORTED) {
@@ -254,7 +254,7 @@ export class PageTarget extends CdpTarget {
         openerPage.emit(PageEvent.Popup, popupPage);
         return true;
       })
-      .catch(debugError);
+      .catch(debugCatchError);
     this._checkIfInitialized();
   }
 

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

@@ -11,7 +11,7 @@ import type {TargetFilterCallback} from '../api/Browser.js';
 import type {CDPSession} from '../api/CDPSession.js';
 import {CDPSessionEvent} from '../api/CDPSession.js';
 import {EventEmitter} from '../common/EventEmitter.js';
-import {debugError} from '../common/util.js';
+import {debugCatchError} from '../common/util.js';
 import {assert} from '../util/assert.js';
 import {Deferred} from '../util/Deferred.js';
 
@@ -229,14 +229,16 @@ export class TargetManager
     session: CdpCDPSession,
     parentSession: Connection | CDPSession,
   ): Promise<void> => {
-    await session.send('Runtime.runIfWaitingForDebugger').catch(debugError);
+    await session
+      .send('Runtime.runIfWaitingForDebugger')
+      .catch(debugCatchError);
     // We don't use `session.detach()` because that dispatches all commands on
     // the connection instead of the parent session.
     await parentSession
       .send('Target.detachFromTarget', {
         sessionId: session.id(),
       })
-      .catch(debugError);
+      .catch(debugCatchError);
   };
 
   #getParentTarget = (
@@ -342,6 +344,7 @@ export class TargetManager
     }
 
     if (!this.#connection.isAutoAttached(targetInfo.targetId)) {
+      await this.#maybeSetupNetworkConditions(session, targetInfo);
       return;
     }
 
@@ -360,6 +363,13 @@ export class TargetManager
     // should determine if a target is auto-attached or not with the help of
     // CDP.
     if (targetInfo.type === 'service_worker') {
+      if (!this.isUrlAllowed(targetInfo.url)) {
+        await Promise.all([
+          this.#maybeSetupNetworkConditions(session, targetInfo),
+          session.send('Runtime.runIfWaitingForDebugger'),
+        ]).catch(debugCatchError);
+        return;
+      }
       await this.#silentDetach(session, parentSession);
       if (
         this.#attachedTargetsByTargetId.has(targetInfo.targetId) ||
@@ -427,8 +437,8 @@ export class TargetManager
       this.#finishInitializationIfReady(parentTarget._targetId);
     }
 
-    // TODO: the browser might be shutting down here. What do we do with the
-    // error?
+    // The browser might be shutting down here, so we
+    // ignore potential errors.
     await Promise.all([
       session.send('Target.setAutoAttach', {
         waitForDebuggerOnStart: true,
@@ -436,9 +446,9 @@ export class TargetManager
         autoAttach: true,
         filter: this.#discoveryFilter,
       }),
-      this.#maybeSetupNetworkConditions(session),
+      this.#maybeSetupNetworkConditions(session, targetInfo),
       session.send('Runtime.runIfWaitingForDebugger'),
-    ]).catch(debugError);
+    ]).catch(debugCatchError);
   };
 
   #finishInitializationIfReady(targetId?: string): void {
@@ -512,7 +522,10 @@ export class TargetManager
     return result;
   }
 
-  #maybeSetupNetworkConditions = async (session: CDPSession): Promise<void> => {
+  #maybeSetupNetworkConditions = async (
+    session: CDPSession,
+    targetInfo: Protocol.Target.TargetInfo,
+  ): Promise<void> => {
     if (this.#blocklist.length === 0 && this.#allowlist.length === 0) {
       return;
     }
@@ -547,9 +560,21 @@ export class TargetManager
       });
     }
 
-    await session.send('Network.emulateNetworkConditionsByRule', {
-      offline: this.#blocklist.length > 0 ? true : undefined,
-      matchedNetworkConditions,
-    });
+    const needsNetwork =
+      targetInfo.type === 'worker' ||
+      targetInfo.type === 'service_worker' ||
+      targetInfo.type === 'shared_worker';
+
+    const promises = [];
+    if (needsNetwork) {
+      promises.push(session.send('Network.enable'));
+    }
+    promises.push(
+      session.send('Network.emulateNetworkConditionsByRule', {
+        offline: this.#blocklist.length > 0 ? true : undefined,
+        matchedNetworkConditions,
+      }),
+    );
+    await Promise.all(promises).catch(debugCatchError);
   };
 }