lighthouse 10.4.0-dev.20230712 → 10.4.0-dev.20230714

package/core/gather/driver/environment.d.ts

@@ -2,18 +2,18 @@ export namespace UIStrings {
     const warningSlowHostCpu: string;
 }
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.Browser.GetVersionResponse & {milestone: number}>}
  */
-export function getBrowserVersion(session: LH.Gatherer.FRProtocolSession): Promise<import("devtools-protocol").Protocol.Browser.GetVersionResponse & {
+export function getBrowserVersion(session: LH.Gatherer.ProtocolSession): Promise<import("devtools-protocol").Protocol.Browser.GetVersionResponse & {
     milestone: number;
 }>;
 /**
  * Computes the benchmark index to get a rough estimate of device class.
- * @param {LH.Gatherer.FRTransitionalDriver['executionContext']} executionContext
+ * @param {LH.Gatherer.Driver['executionContext']} executionContext
  * @return {Promise<number>}
  */
-export function getBenchmarkIndex(executionContext: LH.Gatherer.FRTransitionalDriver['executionContext']): Promise<number>;
+export function getBenchmarkIndex(executionContext: LH.Gatherer.Driver['executionContext']): Promise<number>;
 /**
  * Returns a warning if the host device appeared to be underpowered according to BenchmarkIndex.
  *

package/core/gather/driver/environment.js

@@ -30,7 +30,7 @@ const SLOW_CPU_BENCHMARK_INDEX_THRESHOLD = 1000;
 const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.Browser.GetVersionResponse & {milestone: number}>}
  */
 async function getBrowserVersion(session) {
@@ -45,7 +45,7 @@ async function getBrowserVersion(session) {
 
 /**
  * Computes the benchmark index to get a rough estimate of device class.
- * @param {LH.Gatherer.FRTransitionalDriver['executionContext']} executionContext
+ * @param {LH.Gatherer.Driver['executionContext']} executionContext
  * @return {Promise<number>}
  */
 async function getBenchmarkIndex(executionContext) {

package/core/gather/driver/execution-context.d.ts

@@ -11,9 +11,9 @@ export class ExecutionContext {
      * @return {string}
      */
     static serializeArguments(args: unknown[]): string;
-    /** @param {LH.Gatherer.FRProtocolSession} session */
-    constructor(session: LH.Gatherer.FRProtocolSession);
-    _session: LH.Gatherer.FRProtocolSession;
+    /** @param {LH.Gatherer.ProtocolSession} session */
+    constructor(session: LH.Gatherer.ProtocolSession);
+    _session: LH.Gatherer.ProtocolSession;
     /** @type {number|undefined} */
     _executionContextId: number | undefined;
     /**
@@ -47,6 +47,15 @@ export class ExecutionContext {
      * @return {Promise<*>}
      */
     _evaluateInContext(expression: string, contextId: number | undefined): Promise<any>;
+    /**
+     * Serializes an array of functions or strings.
+     *
+     * Also makes sure that an esbuild-bundled version of Lighthouse will
+     * continue to create working code to be executed within the browser.
+     * @param {Array<Function|string>=} deps
+     * @return {string}
+     */
+    _serializeDeps(deps?: Array<Function | string> | undefined): string;
     /**
      * Note: Prefer `evaluate` instead.
      * Evaluate an expression in the context of the current page. If useIsolation is true, the expression

package/core/gather/driver/execution-context.js

@@ -10,7 +10,7 @@ import * as LH from '../../../types/lh.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 
 class ExecutionContext {
-  /** @param {LH.Gatherer.FRProtocolSession} session */
+  /** @param {LH.Gatherer.ProtocolSession} session */
   constructor(session) {
     this._session = session;
 
@@ -108,6 +108,7 @@ class ExecutionContext {
         ${ExecutionContext._cachedNativesPreamble};
         globalThis.__lighthouseExecutionContextUniqueIdentifier =
           ${uniqueExecutionContextIdentifier};
+        ${pageFunctions.esbuildFunctionNameStubString}
         return new Promise(function (resolve) {
           return Promise.resolve()
             .then(_ => ${expression})
@@ -154,6 +155,28 @@ class ExecutionContext {
     }
   }
 
+  /**
+   * Serializes an array of functions or strings.
+   *
+   * Also makes sure that an esbuild-bundled version of Lighthouse will
+   * continue to create working code to be executed within the browser.
+   * @param {Array<Function|string>=} deps
+   * @return {string}
+   */
+  _serializeDeps(deps) {
+    deps = [pageFunctions.esbuildFunctionNameStubString, ...deps || []];
+    return deps.map(dep => {
+      if (typeof dep === 'function') {
+        // esbuild will change the actual function name (ie. function actualName() {})
+        // always, despite minification settings, but preserve the real name in `actualName.name`
+        // (see esbuildFunctionNameStubString).
+        return `const ${dep.name} = ${dep}`;
+      } else {
+        return dep;
+      }
+    }).join('\n');
+  }
+
   /**
    * Note: Prefer `evaluate` instead.
    * Evaluate an expression in the context of the current page. If useIsolation is true, the expression
@@ -196,7 +219,8 @@ class ExecutionContext {
    */
   evaluate(mainFn, options) {
     const argsSerialized = ExecutionContext.serializeArguments(options.args);
-    const depsSerialized = options.deps ? options.deps.join('\n') : '';
+    const depsSerialized = this._serializeDeps(options.deps);
+
     const expression = `(() => {
       ${depsSerialized}
       return (${mainFn})(${argsSerialized});
@@ -215,7 +239,7 @@ class ExecutionContext {
    */
   async evaluateOnNewDocument(mainFn, options) {
     const argsSerialized = ExecutionContext.serializeArguments(options.args);
-    const depsSerialized = options.deps ? options.deps.join('\n') : '';
+    const depsSerialized = this._serializeDeps(options.deps);
 
     const expression = `(() => {
       ${ExecutionContext._cachedNativesPreamble};

package/core/gather/driver/navigation.d.ts

@@ -7,12 +7,12 @@ export type NavigationOptions = {
  * Typical use of this method involves navigating to a neutral page such as `about:blank` in between
  * navigations.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.NavigationRequestor} requestor
  * @param {NavigationOptions} options
  * @return {Promise<{requestedUrl: string, mainDocumentUrl: string, warnings: Array<LH.IcuMessage>}>}
  */
-export function gotoURL(driver: LH.Gatherer.FRTransitionalDriver, requestor: LH.NavigationRequestor, options: NavigationOptions): Promise<{
+export function gotoURL(driver: LH.Gatherer.Driver, requestor: LH.NavigationRequestor, options: NavigationOptions): Promise<{
     requestedUrl: string;
     mainDocumentUrl: string;
     warnings: Array<LH.IcuMessage>;

package/core/gather/driver/navigation.js

@@ -77,7 +77,7 @@ function resolveWaitForFullyLoadedOptions(options) {
  * Typical use of this method involves navigating to a neutral page such as `about:blank` in between
  * navigations.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.NavigationRequestor} requestor
  * @param {NavigationOptions} options
  * @return {Promise<{requestedUrl: string, mainDocumentUrl: string, warnings: Array<LH.IcuMessage>}>}

package/core/gather/driver/network-monitor.d.ts

@@ -17,16 +17,16 @@ export class NetworkMonitor extends NetworkMonitor_base {
         start: number;
         end: number;
     }>;
-    /** @param {LH.Gatherer.FRTransitionalDriver['targetManager']} targetManager */
-    constructor(targetManager: LH.Gatherer.FRTransitionalDriver['targetManager']);
+    /** @param {LH.Gatherer.Driver['targetManager']} targetManager */
+    constructor(targetManager: LH.Gatherer.Driver['targetManager']);
     /** @type {NetworkRecorder|undefined} */
     _networkRecorder: NetworkRecorder | undefined;
     /** @type {Array<LH.Crdp.Page.Frame>} */
     _frameNavigations: Array<LH.Crdp.Page.Frame>;
-    /** @type {LH.Gatherer.FRTransitionalDriver['targetManager']} */
-    _targetManager: LH.Gatherer.FRTransitionalDriver['targetManager'];
-    /** @type {LH.Gatherer.FRProtocolSession} */
-    _session: LH.Gatherer.FRProtocolSession;
+    /** @type {LH.Gatherer.Driver['targetManager']} */
+    _targetManager: LH.Gatherer.Driver['targetManager'];
+    /** @type {LH.Gatherer.ProtocolSession} */
+    _session: LH.Gatherer.ProtocolSession;
     /** @param {LH.Crdp.Page.FrameNavigatedEvent} event */
     _onFrameNavigated: (event: LH.Crdp.Page.FrameNavigatedEvent) => number;
     /** @param {LH.Protocol.RawEventMessage} event */

package/core/gather/driver/network-monitor.js

@@ -31,14 +31,14 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
   _frameNavigations = [];
 
   // TODO(FR-COMPAT): switch to real TargetManager when legacy removed.
-  /** @param {LH.Gatherer.FRTransitionalDriver['targetManager']} targetManager */
+  /** @param {LH.Gatherer.Driver['targetManager']} targetManager */
   constructor(targetManager) {
     super();
 
-    /** @type {LH.Gatherer.FRTransitionalDriver['targetManager']} */
+    /** @type {LH.Gatherer.Driver['targetManager']} */
     this._targetManager = targetManager;
 
-    /** @type {LH.Gatherer.FRProtocolSession} */
+    /** @type {LH.Gatherer.ProtocolSession} */
     this._session = targetManager.rootSession();
 
     /** @param {LH.Crdp.Page.FrameNavigatedEvent} event */

package/core/gather/driver/network.d.ts

@@ -1,10 +1,10 @@
 /**
  * Return the body of the response with the given ID. Rejects if getting the
  * body times out.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} requestId
  * @param {number} [timeout]
  * @return {Promise<string>}
  */
-export function fetchResponseBodyFromCache(session: LH.Gatherer.FRProtocolSession, requestId: string, timeout?: number | undefined): Promise<string>;
+export function fetchResponseBodyFromCache(session: LH.Gatherer.ProtocolSession, requestId: string, timeout?: number | undefined): Promise<string>;
 //# sourceMappingURL=network.d.ts.map

package/core/gather/driver/network.js

@@ -9,7 +9,7 @@ import {NetworkRequest} from '../../lib/network-request.js';
 /**
  * Return the body of the response with the given ID. Rejects if getting the
  * body times out.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} requestId
  * @param {number} [timeout]
  * @return {Promise<string>}

package/core/gather/driver/prepare.d.ts

@@ -3,42 +3,42 @@
  *
  * This method assumes `prepareTargetForNavigationMode` or `prepareTargetForTimespanMode` has already been invoked.
  *
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @param {{disableThrottling: boolean, blockedUrlPatterns?: string[]}} options
  */
-export function prepareThrottlingAndNetwork(session: LH.Gatherer.FRProtocolSession, settings: LH.Config.Settings, options: {
+export function prepareThrottlingAndNetwork(session: LH.Gatherer.ProtocolSession, settings: LH.Config.Settings, options: {
     disableThrottling: boolean;
     blockedUrlPatterns?: string[];
 }): Promise<void>;
 /**
  * Prepares a target to be analyzed in timespan mode by enabling protocol domains, emulation, and throttling.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.Config.Settings} settings
  */
-export function prepareTargetForTimespanMode(driver: LH.Gatherer.FRTransitionalDriver, settings: LH.Config.Settings): Promise<void>;
+export function prepareTargetForTimespanMode(driver: LH.Gatherer.Driver, settings: LH.Config.Settings): Promise<void>;
 /**
  * Prepares a target to be analyzed in navigation mode by enabling protocol domains, emulation, and new document
  * handlers for global APIs or error handling.
  *
  * This method should be used in combination with `prepareTargetForIndividualNavigation` before a specific navigation occurs.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.Config.Settings} settings
  */
-export function prepareTargetForNavigationMode(driver: LH.Gatherer.FRTransitionalDriver, settings: LH.Config.Settings): Promise<void>;
+export function prepareTargetForNavigationMode(driver: LH.Gatherer.Driver, settings: LH.Config.Settings): Promise<void>;
 /**
  * Prepares a target for a particular navigation by resetting storage and setting network.
  *
  * This method assumes `prepareTargetForNavigationMode` has already been invoked.
  *
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @param {Pick<LH.Config.NavigationDefn, 'disableThrottling'|'disableStorageReset'|'blockedUrlPatterns'> & {requestor: LH.NavigationRequestor}} navigation
  * @return {Promise<{warnings: Array<LH.IcuMessage>}>}
  */
-export function prepareTargetForIndividualNavigation(session: LH.Gatherer.FRProtocolSession, settings: LH.Config.Settings, navigation: Pick<import("../../../types/config.js").default.NavigationDefn, "blockedUrlPatterns" | "disableStorageReset" | "disableThrottling"> & {
+export function prepareTargetForIndividualNavigation(session: LH.Gatherer.ProtocolSession, settings: LH.Config.Settings, navigation: Pick<import("../../../types/config.js").default.NavigationDefn, "blockedUrlPatterns" | "disableStorageReset" | "disableThrottling"> & {
     requestor: LH.NavigationRequestor;
 }): Promise<{
     warnings: Array<LH.IcuMessage>;
@@ -46,7 +46,7 @@ export function prepareTargetForIndividualNavigation(session: LH.Gatherer.FRProt
 /**
  * Enables `Debugger` domain to receive async stacktrace information on network request initiators.
  * This is critical for tracking attribution of tasks and performance simulation accuracy.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  */
-export function enableAsyncStacks(session: LH.Gatherer.FRProtocolSession): Promise<() => Promise<void>>;
+export function enableAsyncStacks(session: LH.Gatherer.ProtocolSession): Promise<() => Promise<void>>;
 //# sourceMappingURL=prepare.d.ts.map

package/core/gather/driver/prepare.js

@@ -13,7 +13,7 @@ import {pageFunctions} from '../../lib/page-functions.js';
 /**
  * Enables `Debugger` domain to receive async stacktrace information on network request initiators.
  * This is critical for tracking attribution of tasks and performance simulation accuracy.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  */
 async function enableAsyncStacks(session) {
   const enable = async () => {
@@ -54,7 +54,7 @@ async function enableAsyncStacks(session) {
 /**
  * Use a RequestIdleCallback shim for tests run with simulated throttling, so that the deadline can be used without
  * a penalty.
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.Config.Settings} settings
  * @return {Promise<void>}
  */
@@ -67,7 +67,7 @@ async function shimRequestIdleCallbackOnNewDocument(driver, settings) {
 /**
  * Dismiss JavaScript dialogs (alert, confirm, prompt), providing a
  * generic promptText in case the dialog is a prompt.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<void>}
  */
 async function dismissJavaScriptDialogs(session) {
@@ -87,7 +87,7 @@ async function dismissJavaScriptDialogs(session) {
 
 /**
  * Reset the storage and warn if any stored data could be affecting the scores.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} url
  * @return {Promise<{warnings: Array<LH.IcuMessage>}>}
  */
@@ -112,7 +112,7 @@ async function resetStorageForUrl(session, url) {
  *
  * This method assumes `prepareTargetForNavigationMode` or `prepareTargetForTimespanMode` has already been invoked.
  *
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @param {{disableThrottling: boolean, blockedUrlPatterns?: string[]}} options
  */
@@ -141,7 +141,7 @@ async function prepareThrottlingAndNetwork(session, settings, options) {
  * Prepares a target to be analyzed by setting up device emulation (screen/UA, not throttling) and
  * async stack traces for network initiators.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.Config.Settings} settings
  */
 async function prepareDeviceEmulation(driver, settings) {
@@ -155,7 +155,7 @@ async function prepareDeviceEmulation(driver, settings) {
 /**
  * Prepares a target to be analyzed in timespan mode by enabling protocol domains, emulation, and throttling.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.Config.Settings} settings
  */
 async function prepareTargetForTimespanMode(driver, settings) {
@@ -176,7 +176,7 @@ async function prepareTargetForTimespanMode(driver, settings) {
  * Ensure the `Intl.Segmenter` created in `pageFunctions.truncate` is cached by v8 before
  * recording the trace begins.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  */
 async function warmUpIntlSegmenter(driver) {
   await driver.executionContext.evaluate(pageFunctions.truncate, {
@@ -190,7 +190,7 @@ async function warmUpIntlSegmenter(driver) {
  *
  * This method should be used in combination with `prepareTargetForIndividualNavigation` before a specific navigation occurs.
  *
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  * @param {LH.Config.Settings} settings
  */
 async function prepareTargetForNavigationMode(driver, settings) {
@@ -220,7 +220,7 @@ async function prepareTargetForNavigationMode(driver, settings) {
  *
  * This method assumes `prepareTargetForNavigationMode` has already been invoked.
  *
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {LH.Config.Settings} settings
  * @param {Pick<LH.Config.NavigationDefn, 'disableThrottling'|'disableStorageReset'|'blockedUrlPatterns'> & {requestor: LH.NavigationRequestor}} navigation
  * @return {Promise<{warnings: Array<LH.IcuMessage>}>}

package/core/gather/driver/service-workers.d.ts

@@ -4,13 +4,13 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>}
  */
-export function getServiceWorkerVersions(session: LH.Gatherer.FRProtocolSession): Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>;
+export function getServiceWorkerVersions(session: LH.Gatherer.ProtocolSession): Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.ServiceWorker.WorkerRegistrationUpdatedEvent>}
  */
-export function getServiceWorkerRegistrations(session: LH.Gatherer.FRProtocolSession): Promise<LH.Crdp.ServiceWorker.WorkerRegistrationUpdatedEvent>;
+export function getServiceWorkerRegistrations(session: LH.Gatherer.ProtocolSession): Promise<LH.Crdp.ServiceWorker.WorkerRegistrationUpdatedEvent>;
 //# sourceMappingURL=service-workers.d.ts.map

package/core/gather/driver/service-workers.js

@@ -5,7 +5,7 @@
  */
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>}
  */
 function getServiceWorkerVersions(session) {
@@ -37,7 +37,7 @@ function getServiceWorkerVersions(session) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.Crdp.ServiceWorker.WorkerRegistrationUpdatedEvent>}
  */
 function getServiceWorkerRegistrations(session) {

package/core/gather/driver/storage.d.ts

@@ -1,21 +1,21 @@
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} url
  * @return {Promise<LH.IcuMessage[]>}
  */
-export function clearDataForOrigin(session: LH.Gatherer.FRProtocolSession, url: string): Promise<LH.IcuMessage[]>;
+export function clearDataForOrigin(session: LH.Gatherer.ProtocolSession, url: string): Promise<LH.IcuMessage[]>;
 /**
  * Clear the network cache on disk and in memory.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.IcuMessage[]>}
  */
-export function clearBrowserCaches(session: LH.Gatherer.FRProtocolSession): Promise<LH.IcuMessage[]>;
+export function clearBrowserCaches(session: LH.Gatherer.ProtocolSession): Promise<LH.IcuMessage[]>;
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} url
  * @return {Promise<LH.IcuMessage | undefined>}
  */
-export function getImportantStorageWarning(session: LH.Gatherer.FRProtocolSession, url: string): Promise<LH.IcuMessage | undefined>;
+export function getImportantStorageWarning(session: LH.Gatherer.ProtocolSession, url: string): Promise<LH.IcuMessage | undefined>;
 export namespace UIStrings {
     const warningData: string;
     const warningCacheTimeout: string;

package/core/gather/driver/storage.js

@@ -34,7 +34,7 @@ const str_ = i18n.createIcuMessageFn(import.meta.url, UIStrings);
 
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} url
  * @return {Promise<LH.IcuMessage[]>}
  */
@@ -82,7 +82,7 @@ async function clearDataForOrigin(session, url) {
 }
 
 /**
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {string} url
  * @return {Promise<LH.IcuMessage | undefined>}
  */
@@ -112,7 +112,7 @@ async function getImportantStorageWarning(session, url) {
 
 /**
  * Clear the network cache on disk and in memory.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {Promise<LH.IcuMessage[]>}
  */
 async function clearBrowserCaches(session) {

package/core/gather/driver/target-manager.d.ts

@@ -1,7 +1,7 @@
 export type TargetWithSession = {
     target: LH.Crdp.Target.TargetInfo;
     cdpSession: LH.Puppeteer.CDPSession;
-    session: LH.Gatherer.FRProtocolSession;
+    session: LH.Gatherer.ProtocolSession;
     protocolListener: (event: unknown) => void;
 };
 export type ProtocolEventMap = {
@@ -46,14 +46,14 @@ export class TargetManager extends TargetManager_base {
     _onExecutionContextsCleared(): void;
     /**
      * @param {string} sessionId
-     * @return {LH.Gatherer.FRProtocolSession}
+     * @return {LH.Gatherer.ProtocolSession}
      */
-    _findSession(sessionId: string): LH.Gatherer.FRProtocolSession;
+    _findSession(sessionId: string): LH.Gatherer.ProtocolSession;
     /**
      * Returns the root session.
-     * @return {LH.Gatherer.FRProtocolSession}
+     * @return {LH.Gatherer.ProtocolSession}
      */
-    rootSession(): LH.Gatherer.FRProtocolSession;
+    rootSession(): LH.Gatherer.ProtocolSession;
     mainFrameExecutionContexts(): import("devtools-protocol").Protocol.Runtime.ExecutionContextDescription[];
     /**
      * Returns a listener for all protocol events from session, and augments the
@@ -71,5 +71,6 @@ export class TargetManager extends TargetManager_base {
      */
     disable(): Promise<void>;
 }
+import { ProtocolSession } from '../session.js';
 export {};
 //# sourceMappingURL=target-manager.d.ts.map

package/core/gather/driver/target-manager.js

@@ -19,7 +19,7 @@ import {ProtocolSession} from '../session.js';
  * @typedef {{
  *   target: LH.Crdp.Target.TargetInfo,
  *   cdpSession: LH.Puppeteer.CDPSession,
- *   session: LH.Gatherer.FRProtocolSession,
+ *   session: LH.Gatherer.ProtocolSession,
  *   protocolListener: (event: unknown) => void,
  * }} TargetWithSession
  */
@@ -84,7 +84,7 @@ class TargetManager extends ProtocolEventEmitter {
 
   /**
    * @param {string} sessionId
-   * @return {LH.Gatherer.FRProtocolSession}
+   * @return {LH.Gatherer.ProtocolSession}
    */
   _findSession(sessionId) {
     for (const {session, cdpSession} of this._targetIdToTargets.values()) {
@@ -96,7 +96,7 @@ class TargetManager extends ProtocolEventEmitter {
 
   /**
    * Returns the root session.
-   * @return {LH.Gatherer.FRProtocolSession}
+   * @return {LH.Gatherer.ProtocolSession}
    */
   rootSession() {
     const rootSessionId = this._rootCdpSession.id();

package/core/gather/driver/wait-for-condition.d.ts

@@ -49,35 +49,35 @@ export function waitForNothing(): {
 /**
  * Returns a promise that resolve when a frame has been navigated.
  * Used for detecting that our about:blank reset has been completed.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @return {CancellableWait<LH.Crdp.Page.FrameNavigatedEvent>}
  */
-export function waitForFrameNavigated(session: LH.Gatherer.FRProtocolSession): CancellableWait<LH.Crdp.Page.FrameNavigatedEvent>;
+export function waitForFrameNavigated(session: LH.Gatherer.ProtocolSession): CancellableWait<LH.Crdp.Page.FrameNavigatedEvent>;
 /**
  * Returns a promise that resolve when a frame has a FCP.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} pauseAfterFcpMs
  * @param {number} maxWaitForFcpMs
  * @return {CancellableWait}
  */
-export function waitForFcp(session: LH.Gatherer.FRProtocolSession, pauseAfterFcpMs: number, maxWaitForFcpMs: number): CancellableWait;
+export function waitForFcp(session: LH.Gatherer.ProtocolSession, pauseAfterFcpMs: number, maxWaitForFcpMs: number): CancellableWait;
 /**
  * Return a promise that resolves `pauseAfterLoadMs` after the load event
  * fires and a method to cancel internal listeners and timeout.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} pauseAfterLoadMs
  * @return {CancellableWait}
  */
-export function waitForLoadEvent(session: LH.Gatherer.FRProtocolSession, pauseAfterLoadMs: number): CancellableWait;
+export function waitForLoadEvent(session: LH.Gatherer.ProtocolSession, pauseAfterLoadMs: number): CancellableWait;
 /**
  * Returns a promise that resolves when the network has been idle (after DCL) for
  * `networkQuietThresholdMs` ms and a method to cancel internal network listeners/timeout.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {NetworkMonitor} networkMonitor
  * @param {{networkQuietThresholdMs: number, busyEvent: NetworkMonitorEvent, idleEvent: NetworkMonitorEvent, isIdle(recorder: NetworkMonitor): boolean, pretendDCLAlreadyFired?: boolean}} networkQuietOptions
  * @return {CancellableWait}
  */
-export function waitForNetworkIdle(session: LH.Gatherer.FRProtocolSession, networkMonitor: NetworkMonitor, networkQuietOptions: {
+export function waitForNetworkIdle(session: LH.Gatherer.ProtocolSession, networkMonitor: NetworkMonitor, networkQuietOptions: {
     networkQuietThresholdMs: number;
     busyEvent: NetworkMonitorEvent;
     idleEvent: NetworkMonitorEvent;
@@ -86,11 +86,11 @@ export function waitForNetworkIdle(session: LH.Gatherer.FRProtocolSession, netwo
 }): CancellableWait;
 /**
  * Resolves when there have been no long tasks for at least waitForCPUQuiet ms.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {number} waitForCPUQuiet
  * @return {CancellableWait}
  */
-export function waitForCPUIdle(session: LH.Gatherer.FRProtocolSession, waitForCPUQuiet: number): CancellableWait;
+export function waitForCPUIdle(session: LH.Gatherer.ProtocolSession, waitForCPUQuiet: number): CancellableWait;
 /**
  * Returns a promise that resolves when:
  * - All of the following conditions have been met:
@@ -101,16 +101,16 @@ export function waitForCPUIdle(session: LH.Gatherer.FRProtocolSession, waitForCP
  *    - cpuQuietThresholdMs have passed since the last long task after network-2-quiet.
  * - maxWaitForLoadedMs milliseconds have passed.
  * See https://github.com/GoogleChrome/lighthouse/issues/627 for more.
- * @param {LH.Gatherer.FRProtocolSession} session
+ * @param {LH.Gatherer.ProtocolSession} session
  * @param {NetworkMonitor} networkMonitor
  * @param {WaitOptions} options
  * @return {Promise<{timedOut: boolean}>}
  */
-export function waitForFullyLoaded(session: LH.Gatherer.FRProtocolSession, networkMonitor: NetworkMonitor, options: WaitOptions): Promise<{
+export function waitForFullyLoaded(session: LH.Gatherer.ProtocolSession, networkMonitor: NetworkMonitor, options: WaitOptions): Promise<{
     timedOut: boolean;
 }>;
 /**
- * @param {LH.Gatherer.FRTransitionalDriver} driver
+ * @param {LH.Gatherer.Driver} driver
  */
-export function waitForUserToContinue(driver: LH.Gatherer.FRTransitionalDriver): Promise<void>;
+export function waitForUserToContinue(driver: LH.Gatherer.Driver): Promise<void>;
 //# sourceMappingURL=wait-for-condition.d.ts.map