lighthouse 12.0.0-dev.20240609 → 12.0.0-dev.20240611

package/core/audits/long-tasks.d.ts

@@ -25,11 +25,11 @@ declare class LongTasks extends Audit {
      * most time will be attributed to 'other' (the category of the top-level
      * RunTask). See pruning in `PageDependencyGraph.linkCPUNodes`.
      * @param {LH.Artifacts.TaskNode} task
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @param {Map<TaskGroupIds, number>} [timeByTaskGroup]
      * @return {{startTime: number, duration: number, timeByTaskGroup: Map<TaskGroupIds, number>}}
      */
-    static getTimingBreakdown(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined, timeByTaskGroup?: Map<import("../lib/tracehouse/task-groups.js").TaskGroupIds, number> | undefined): {
+    static getTimingBreakdown(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined, timeByTaskGroup?: Map<import("../lib/tracehouse/task-groups.js").TaskGroupIds, number> | undefined): {
         startTime: number;
         duration: number;
         timeByTaskGroup: Map<TaskGroupIds, number>;
@@ -37,17 +37,17 @@ declare class LongTasks extends Audit {
     /**
      * @param {Array<LH.Artifacts.TaskNode>} longTasks
      * @param {Set<string>} jsUrls
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @return {LH.Audit.Details.DebugData}
      */
-    static makeDebugData(longTasks: Array<LH.Artifacts.TaskNode>, jsUrls: Set<string>, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): LH.Audit.Details.DebugData;
+    static makeDebugData(longTasks: Array<LH.Artifacts.TaskNode>, jsUrls: Set<string>, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): LH.Audit.Details.DebugData;
     /**
      * Get timing from task, overridden by taskTimingsByEvent if provided.
      * @param {LH.Artifacts.TaskNode} task
-     * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+     * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
      * @return {Timing}
      */
-    static getTiming(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): Timing;
+    static getTiming(task: LH.Artifacts.TaskNode, taskTimingsByEvent: Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming> | undefined): Timing;
     /**
      * @param {LH.Artifacts} artifacts
      * @param {LH.Audit.Context} context
@@ -61,4 +61,5 @@ export namespace UIStrings {
     const displayValue: string;
 }
 import { Audit } from './audit.js';
+import * as Lantern from '../lib/lantern/types/lantern.js';
 //# sourceMappingURL=long-tasks.d.ts.map

package/core/audits/long-tasks.js

@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/types/lantern.js';
 import {Audit} from './audit.js';
 import {NetworkRecords} from '../computed/network-records.js';
 import * as i18n from '../lib/i18n/i18n.js';
@@ -85,7 +86,7 @@ class LongTasks extends Audit {
    * most time will be attributed to 'other' (the category of the top-level
    * RunTask). See pruning in `PageDependencyGraph.linkCPUNodes`.
    * @param {LH.Artifacts.TaskNode} task
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @param {Map<TaskGroupIds, number>} [timeByTaskGroup]
    * @return {{startTime: number, duration: number, timeByTaskGroup: Map<TaskGroupIds, number>}}
    */
@@ -116,7 +117,7 @@ class LongTasks extends Audit {
   /**
    * @param {Array<LH.Artifacts.TaskNode>} longTasks
    * @param {Set<string>} jsUrls
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @return {LH.Audit.Details.DebugData}
    */
   static makeDebugData(longTasks, jsUrls, taskTimingsByEvent) {
@@ -154,7 +155,7 @@ class LongTasks extends Audit {
   /**
    * Get timing from task, overridden by taskTimingsByEvent if provided.
    * @param {LH.Artifacts.TaskNode} task
-   * @param {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
+   * @param {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} taskTimingsByEvent
    * @return {Timing}
    */
   static getTiming(task, taskTimingsByEvent) {
@@ -184,7 +185,7 @@ class LongTasks extends Audit {
     const metricComputationData = Audit.makeMetricComputationDataInput(artifacts, context);
     const tbtResult = await TotalBlockingTime.request(metricComputationData, context);
 
-    /** @type {Map<LH.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} */
+    /** @type {Map<Lantern.TraceEvent, LH.Gatherer.Simulation.NodeTiming>|undefined} */
     let taskTimingsByEvent;
 
     if (settings.throttlingMethod === 'simulate') {

package/core/computed/metrics/lantern-metric.js

@@ -10,7 +10,7 @@ import {LoadSimulator} from '../load-simulator.js';
 import {ProcessedNavigation} from '../processed-navigation.js';
 import {PageDependencyGraph} from '../page-dependency-graph.js';
 import {TraceEngineResult} from '../trace-engine-result.js';
-import {createProcessedNavigation} from '../../lib/lantern/lantern.js';
+import {createProcessedNavigation} from '../../lib/lantern/trace-engine-computation-data.js';
 
 /**
  * @param {LH.Artifacts.MetricComputationDataInput} data
@@ -39,7 +39,7 @@ async function getComputationDataParamsFromTrace(data, context) {
 
   const graph = await PageDependencyGraph.request({...data, fromTrace: true}, context);
   const traceEngineResult = await TraceEngineResult.request(data, context);
-  const processedNavigation = createProcessedNavigation(traceEngineResult);
+  const processedNavigation = createProcessedNavigation(traceEngineResult.data);
   const simulator = data.simulator || (await LoadSimulator.request(data, context));
 
   return {simulator, graph, processedNavigation};

package/core/computed/metrics/lantern-speed-index.js

@@ -34,7 +34,7 @@ class LanternSpeedIndex extends SpeedIndex {
     const speedline = await Speedline.request(data.trace, context);
     const fcpResult = await LanternFirstContentfulPaint.request(data, context);
     return this.computeMetricWithGraphs(data, context, {
-      speedline,
+      observedSpeedIndex: speedline.speedIndex,
       fcpResult,
     });
   }

package/core/computed/metrics/total-blocking-time.js

@@ -9,7 +9,7 @@ import ComputedMetric from './metric.js';
 import {TraceProcessor} from '../../lib/tracehouse/trace-processor.js';
 import {LanternTotalBlockingTime} from './lantern-total-blocking-time.js';
 import {Interactive} from './interactive.js';
-import {calculateSumOfBlockingTime} from './tbt-utils.js';
+import {calculateSumOfBlockingTime} from '../../lib/lantern/tbt-utils.js';
 
 /**
  * @fileoverview This audit determines Total Blocking Time.

package/core/computed/navigation-insights.d.ts

@@ -2,17 +2,7 @@ export { NavigationInsightsComputed as NavigationInsights };
 declare const NavigationInsightsComputed: typeof NavigationInsights & {
     request: (dependencies: import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
-    }>) => Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData<{
-        AuctionWorklets: typeof import("@paulirish/trace_engine/models/trace/handlers/AuctionWorkletsHandler.js");
-        Initiators: typeof import("@paulirish/trace_engine/models/trace/handlers/InitiatorsHandler.js");
-        LayoutShifts: typeof import("@paulirish/trace_engine/models/trace/handlers/LayoutShiftsHandler.js");
-        NetworkRequests: typeof import("@paulirish/trace_engine/models/trace/handlers/NetworkRequestsHandler.js");
-        Renderer: typeof import("@paulirish/trace_engine/models/trace/handlers/RendererHandler.js");
-        Samples: typeof import("@paulirish/trace_engine/models/trace/handlers/SamplesHandler.js");
-        Screenshots: typeof import("@paulirish/trace_engine/models/trace/handlers/ScreenshotsHandler.js");
-        PageLoadMetrics: typeof import("@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js");
-        Workers: typeof import("@paulirish/trace_engine/models/trace/handlers/WorkersHandler.js");
-    }>>;
+    }>) => Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData<typeof import("@paulirish/trace_engine/models/trace/handlers/ModelHandlers.js")>>;
 };
 /**
  * @fileoverview Gets insights from the shared trace engine for the navigation audited by Lighthouse.
@@ -23,16 +13,6 @@ declare class NavigationInsights {
       * @param {LH.Trace} trace
       * @param {LH.Artifacts.ComputedContext} context
      */
-    static compute_(trace: LH.Trace, context: LH.Artifacts.ComputedContext): Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData<{
-        AuctionWorklets: typeof import("@paulirish/trace_engine/models/trace/handlers/AuctionWorkletsHandler.js");
-        Initiators: typeof import("@paulirish/trace_engine/models/trace/handlers/InitiatorsHandler.js");
-        LayoutShifts: typeof import("@paulirish/trace_engine/models/trace/handlers/LayoutShiftsHandler.js");
-        NetworkRequests: typeof import("@paulirish/trace_engine/models/trace/handlers/NetworkRequestsHandler.js");
-        Renderer: typeof import("@paulirish/trace_engine/models/trace/handlers/RendererHandler.js");
-        Samples: typeof import("@paulirish/trace_engine/models/trace/handlers/SamplesHandler.js");
-        Screenshots: typeof import("@paulirish/trace_engine/models/trace/handlers/ScreenshotsHandler.js");
-        PageLoadMetrics: typeof import("@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js");
-        Workers: typeof import("@paulirish/trace_engine/models/trace/handlers/WorkersHandler.js");
-    }>>;
+    static compute_(trace: LH.Trace, context: LH.Artifacts.ComputedContext): Promise<import("@paulirish/trace_engine/models/trace/insights/types.js").NavigationInsightData<typeof import("@paulirish/trace_engine/models/trace/handlers/ModelHandlers.js")>>;
 }
 //# sourceMappingURL=navigation-insights.d.ts.map

package/core/computed/page-dependency-graph.js

@@ -10,6 +10,7 @@ import {NetworkRequest} from '../lib/network-request.js';
 import {ProcessedTrace} from './processed-trace.js';
 import {NetworkRecords} from './network-records.js';
 import {TraceEngineResult} from './trace-engine-result.js';
+import * as TraceEngineComputationData from '../lib/lantern/trace-engine-computation-data.js';
 
 /** @typedef {import('../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
@@ -28,8 +29,10 @@ class PageDependencyGraph {
 
     if (data.fromTrace) {
       const traceEngineResult = await TraceEngineResult.request({trace}, context);
-      const {graph} = await LanternPageDependencyGraph.createGraphFromTrace(
-        mainThreadEvents, trace, traceEngineResult, URL);
+      const traceEngineData = traceEngineResult.data;
+      const requests = TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
+      const graph =
+        TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
       return graph;
     }
 

package/core/computed/processed-navigation.d.ts

@@ -1,6 +1,6 @@
 export { ProcessedNavigationComputed as ProcessedNavigation };
 declare const ProcessedNavigationComputed: typeof ProcessedNavigation & {
-    request: (dependencies: import("../index.js").Artifacts.ProcessedTrace | import("../index.js").Trace, context: import("../../types/utility-types.js").default.ImmutableObject<{
+    request: (dependencies: import("../index.js").Trace | import("../index.js").Artifacts.ProcessedTrace, context: import("../../types/utility-types.js").default.ImmutableObject<{
         computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
     }>) => Promise<import("../index.js").Artifacts.ProcessedNavigation>;
 };

package/core/computed/tbt-impact-tasks.js

@@ -4,13 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/types/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {MainThreadTasks} from './main-thread-tasks.js';
 import {FirstContentfulPaint} from './metrics/first-contentful-paint.js';
 import {Interactive} from './metrics/interactive.js';
 import {TotalBlockingTime} from './metrics/total-blocking-time.js';
 import {ProcessedTrace} from './processed-trace.js';
-import {calculateTbtImpactForEvent} from './metrics/tbt-utils.js';
+import {calculateTbtImpactForEvent} from '../lib/lantern/tbt-utils.js';
 
 class TBTImpactTasks {
   /**
@@ -132,7 +133,7 @@ class TBTImpactTasks {
     /** @type {Map<LH.Artifacts.TaskNode, {start: number, end: number, duration: number}>} */
     const topLevelTaskToEvent = new Map();
 
-    /** @type {Map<LH.TraceEvent, LH.Artifacts.TaskNode>} */
+    /** @type {Map<Lantern.TraceEvent, LH.Artifacts.TaskNode>} */
     const traceEventToTask = new Map();
     for (const task of tasks) {
       traceEventToTask.set(task.event, task);

package/core/computed/trace-engine-result.d.ts

@@ -1,5 +1,4 @@
 export { TraceEngineResultComputed as TraceEngineResult };
-export type EnabledHandlers = typeof ENABLED_HANDLERS;
 declare const TraceEngineResultComputed: typeof TraceEngineResult & {
     request: (dependencies: {
         trace: LH.Trace;
@@ -7,17 +6,6 @@ declare const TraceEngineResultComputed: typeof TraceEngineResult & {
         computedCache: Map<string, import("../lib/arbitrary-equality-map.js").ArbitraryEqualityMap>;
     }>) => Promise<LH.Artifacts.TraceEngineResult>;
 };
-declare namespace ENABLED_HANDLERS {
-    const AuctionWorklets: typeof import("@paulirish/trace_engine/models/trace/handlers/AuctionWorkletsHandler.js");
-    const Initiators: typeof import("@paulirish/trace_engine/models/trace/handlers/InitiatorsHandler.js");
-    const LayoutShifts: typeof import("@paulirish/trace_engine/models/trace/handlers/LayoutShiftsHandler.js");
-    const NetworkRequests: typeof import("@paulirish/trace_engine/models/trace/handlers/NetworkRequestsHandler.js");
-    const Renderer: typeof import("@paulirish/trace_engine/models/trace/handlers/RendererHandler.js");
-    const Samples: typeof import("@paulirish/trace_engine/models/trace/handlers/SamplesHandler.js");
-    const Screenshots: typeof import("@paulirish/trace_engine/models/trace/handlers/ScreenshotsHandler.js");
-    const PageLoadMetrics: typeof import("@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js");
-    const Workers: typeof import("@paulirish/trace_engine/models/trace/handlers/WorkersHandler.js");
-}
 /**
  * @fileoverview Processes trace with the shared trace engine.
  */

package/core/computed/trace-engine-result.js

@@ -10,20 +10,6 @@ import {CumulativeLayoutShift} from './metrics/cumulative-layout-shift.js';
 import {ProcessedTrace} from './processed-trace.js';
 import * as LH from '../../types/lh.js';
 
-/** @typedef {typeof ENABLED_HANDLERS} EnabledHandlers */
-
-const ENABLED_HANDLERS = {
-  AuctionWorklets: TraceEngine.TraceHandlers.AuctionWorklets,
-  Initiators: TraceEngine.TraceHandlers.Initiators,
-  LayoutShifts: TraceEngine.TraceHandlers.LayoutShifts,
-  NetworkRequests: TraceEngine.TraceHandlers.NetworkRequests,
-  Renderer: TraceEngine.TraceHandlers.Renderer,
-  Samples: TraceEngine.TraceHandlers.Samples,
-  Screenshots: TraceEngine.TraceHandlers.Screenshots,
-  PageLoadMetrics: TraceEngine.TraceHandlers.PageLoadMetrics,
-  Workers: TraceEngine.TraceHandlers.Workers,
-};
-
 /**
  * @fileoverview Processes trace with the shared trace engine.
  */
@@ -33,15 +19,14 @@ class TraceEngineResult {
    * @return {Promise<LH.Artifacts.TraceEngineResult>}
    */
   static async runTraceEngine(traceEvents) {
-    const engine = new TraceEngine.TraceProcessor(ENABLED_HANDLERS);
+    const processor = TraceEngine.TraceProcessor.createWithAllHandlers();
     // eslint-disable-next-line max-len
-    await engine.parse(/** @type {import('@paulirish/trace_engine').Types.TraceEvents.TraceEventData[]} */ (
+    await processor.parse(/** @type {import('@paulirish/trace_engine').Types.TraceEvents.TraceEventData[]} */ (
       traceEvents
     ));
-    // TODO: use TraceEngine.TraceProcessor.createWithAllHandlers above.
-    if (!engine.traceParsedData) throw new Error('No data');
-    if (!engine.insights) throw new Error('No insights');
-    return {data: engine.traceParsedData, insights: engine.insights};
+    if (!processor.traceParsedData) throw new Error('No data');
+    if (!processor.insights) throw new Error('No insights');
+    return {data: processor.traceParsedData, insights: processor.insights};
   }
 
   /**

package/core/config/constants.d.ts

@@ -1,43 +1,31 @@
-export namespace throttling {
-    export { DEVTOOLS_RTT_ADJUSTMENT_FACTOR };
-    export { DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR };
-    export namespace mobileSlow4G {
-        const rttMs: number;
-        const throughputKbps: number;
-        const requestLatencyMs: number;
-        const downloadThroughputKbps: number;
-        const uploadThroughputKbps: number;
-        const cpuSlowdownMultiplier: number;
-    }
-    export namespace mobileRegular3G {
-        const rttMs_1: number;
-        export { rttMs_1 as rttMs };
-        const throughputKbps_1: number;
-        export { throughputKbps_1 as throughputKbps };
-        const requestLatencyMs_1: number;
-        export { requestLatencyMs_1 as requestLatencyMs };
-        const downloadThroughputKbps_1: number;
-        export { downloadThroughputKbps_1 as downloadThroughputKbps };
-        const uploadThroughputKbps_1: number;
-        export { uploadThroughputKbps_1 as uploadThroughputKbps };
-        const cpuSlowdownMultiplier_1: number;
-        export { cpuSlowdownMultiplier_1 as cpuSlowdownMultiplier };
-    }
-    export namespace desktopDense4G {
-        const rttMs_2: number;
-        export { rttMs_2 as rttMs };
-        const throughputKbps_2: number;
-        export { throughputKbps_2 as throughputKbps };
-        const cpuSlowdownMultiplier_2: number;
-        export { cpuSlowdownMultiplier_2 as cpuSlowdownMultiplier };
-        const requestLatencyMs_2: number;
-        export { requestLatencyMs_2 as requestLatencyMs };
-        const downloadThroughputKbps_2: number;
-        export { downloadThroughputKbps_2 as downloadThroughputKbps };
-        const uploadThroughputKbps_2: number;
-        export { uploadThroughputKbps_2 as uploadThroughputKbps };
-    }
-}
+export const throttling: {
+    DEVTOOLS_RTT_ADJUSTMENT_FACTOR: number;
+    DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: number;
+    mobileSlow4G: {
+        rttMs: number;
+        throughputKbps: number;
+        requestLatencyMs: number;
+        downloadThroughputKbps: number;
+        uploadThroughputKbps: number;
+        cpuSlowdownMultiplier: number;
+    };
+    mobileRegular3G: {
+        rttMs: number;
+        throughputKbps: number;
+        requestLatencyMs: number;
+        downloadThroughputKbps: number;
+        uploadThroughputKbps: number;
+        cpuSlowdownMultiplier: number;
+    };
+    desktopDense4G: {
+        rttMs: number;
+        throughputKbps: number;
+        cpuSlowdownMultiplier: number;
+        requestLatencyMs: number;
+        downloadThroughputKbps: number;
+        uploadThroughputKbps: number;
+    };
+};
 export namespace screenEmulationMetrics {
     export { MOTOGPOWER_EMULATION_METRICS as mobile };
     export { DESKTOP_EMULATION_METRICS as desktop };
@@ -54,19 +42,6 @@ export namespace nonSimulatedSettingsOverrides {
     const networkQuietThresholdMs: number;
     const cpuQuietThresholdMs: number;
 }
-/**
- * @license
- * Copyright 2018 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * Adjustments needed for DevTools network throttling to simulate
- * more realistic network conditions.
- * @see https://crbug.com/721112
- * @see https://docs.google.com/document/d/10lfVdS1iDWCRKQXPfbxEn4Or99D64mvNlugP1AQuFlE/edit
- */
-declare const DEVTOOLS_RTT_ADJUSTMENT_FACTOR: 3.75;
-declare const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: 0.9;
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}
  */

package/core/config/constants.js

@@ -4,50 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/**
- * Adjustments needed for DevTools network throttling to simulate
- * more realistic network conditions.
- * @see https://crbug.com/721112
- * @see https://docs.google.com/document/d/10lfVdS1iDWCRKQXPfbxEn4Or99D64mvNlugP1AQuFlE/edit
- */
-const DEVTOOLS_RTT_ADJUSTMENT_FACTOR = 3.75;
-const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR = 0.9;
+import * as Lantern from '../lib/lantern/lantern.js';
 
-const throttling = {
-  DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
-  DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-  // These values align with WebPageTest's definition of "Fast 3G"
-  // But offer similar characteristics to roughly the 75th percentile of 4G connections.
-  mobileSlow4G: {
-    rttMs: 150,
-    throughputKbps: 1.6 * 1024,
-    requestLatencyMs: 150 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
-    downloadThroughputKbps: 1.6 * 1024 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    uploadThroughputKbps: 750 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    cpuSlowdownMultiplier: 4,
-  },
-  // These values partially align with WebPageTest's definition of "Regular 3G".
-  // These values are meant to roughly align with Chrome UX report's 3G definition which are based
-  // on HTTP RTT of 300-1400ms and downlink throughput of <700kbps.
-  mobileRegular3G: {
-    rttMs: 300,
-    throughputKbps: 700,
-    requestLatencyMs: 300 * DEVTOOLS_RTT_ADJUSTMENT_FACTOR,
-    downloadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    uploadThroughputKbps: 700 * DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR,
-    cpuSlowdownMultiplier: 4,
-  },
-  // Using a "broadband" connection type
-  // Corresponds to "Dense 4G 25th percentile" in https://docs.google.com/document/d/1Ft1Bnq9-t4jK5egLSOc28IL4TvR-Tt0se_1faTA4KTY/edit#heading=h.bb7nfy2x9e5v
-  desktopDense4G: {
-    rttMs: 40,
-    throughputKbps: 10 * 1024,
-    cpuSlowdownMultiplier: 1,
-    requestLatencyMs: 0, // 0 means unset
-    downloadThroughputKbps: 0,
-    uploadThroughputKbps: 0,
-  },
-};
+const throttling = Lantern.constants.throttling;
 
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}

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

@@ -66,7 +66,7 @@ export class TargetManager extends TargetManager_base {
      * @param {LH.Protocol.TargetType} targetType
      * @param {string} sessionId
      */
-    _getProtocolEventListener(targetType: LH.Protocol.TargetType, sessionId: string): <EventName extends keyof import("puppeteer-core").ProtocolMapping.Events>(method: EventName, params: import("../../../types/protocol.js").default.RawEventMessageRecord[EventName]["params"]) => void;
+    _getProtocolEventListener(targetType: LH.Protocol.TargetType, sessionId: string): <EventName extends keyof import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Events>(method: EventName, params: import("../../../types/protocol.js").default.RawEventMessageRecord[EventName]["params"]) => void;
     /**
      * @return {Promise<void>}
      */

package/core/gather/gatherers/root-causes.js

@@ -114,7 +114,6 @@ class RootCauses extends BaseGatherer {
     const rootCausesEngine = new TraceEngine.RootCauses(protocolInterface);
     const layoutShiftEvents = traceParsedData.LayoutShifts.clusters.flatMap(c => c.events);
     for (const event of layoutShiftEvents) {
-      // @ts-expect-error The data we do get in the trace processor is still enough here
       const r = await rootCausesEngine.layoutShifts.rootCausesForEvent(traceParsedData, event);
       if (!r) continue;
 

package/core/gather/session.d.ts

@@ -17,7 +17,7 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @param {E} method
      * @param {LH.CrdpEvents[E]} params
      */
-    _handleProtocolEvent<E extends keyof import("puppeteer-core").ProtocolMapping.Events>(method: E, ...params: import("puppeteer-core").ProtocolMapping.Events[E]): void;
+    _handleProtocolEvent<E extends keyof import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Events>(method: E, ...params: import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Events[E]): void;
     _targetCrashedPromise: Promise<never>;
     id(): string;
     /** @param {LH.Crdp.Target.TargetInfo} targetInfo */
@@ -40,7 +40,7 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @param {LH.CrdpCommands[C]['paramsType']} params
      * @return {Promise<LH.CrdpCommands[C]['returnType']>}
      */
-    sendCommand<C extends keyof import("puppeteer-core").ProtocolMapping.Commands>(method: C, ...params: import("puppeteer-core").ProtocolMapping.Commands[C]["paramsType"]): Promise<import("puppeteer-core").ProtocolMapping.Commands[C]["returnType"]>;
+    sendCommand<C extends keyof import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Commands>(method: C, ...params: import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Commands[C]["paramsType"]): Promise<import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Commands[C]["returnType"]>;
     /**
      * Send and if there's an error response, do not reject.
      * @template {keyof LH.CrdpCommands} C
@@ -48,7 +48,7 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @param {LH.CrdpCommands[C]['paramsType']} params
      * @return {Promise<void>}
      */
-    sendCommandAndIgnore<C_1 extends keyof import("puppeteer-core").ProtocolMapping.Commands>(method: C_1, ...params: import("puppeteer-core").ProtocolMapping.Commands[C_1]["paramsType"]): Promise<void>;
+    sendCommandAndIgnore<C_1 extends keyof import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Commands>(method: C_1, ...params: import("devtools-protocol/types/protocol-mapping.js").ProtocolMapping.Commands[C_1]["paramsType"]): Promise<void>;
     /**
      * Disposes of a session so that it can no longer talk to Chrome.
      * @return {Promise<void>}

package/core/lib/lantern/cpu-node.d.ts

@@ -4,13 +4,13 @@
  */
 export class CPUNode<T = any> extends BaseNode<T> {
     /**
-     * @param {LH.TraceEvent} parentEvent
-     * @param {LH.TraceEvent[]=} childEvents
+     * @param {Lantern.TraceEvent} parentEvent
+     * @param {Lantern.TraceEvent[]=} childEvents
      * @param {number=} correctedEndTs
      */
-    constructor(parentEvent: LH.TraceEvent, childEvents?: LH.TraceEvent[] | undefined, correctedEndTs?: number | undefined);
-    _event: LH.TraceEvent;
-    _childEvents: LH.TraceEvent[];
+    constructor(parentEvent: Lantern.TraceEvent, childEvents?: Lantern.TraceEvent[] | undefined, correctedEndTs?: number | undefined);
+    _event: Lantern.TraceEvent;
+    _childEvents: Lantern.TraceEvent[];
     _correctedEndTs: number | undefined;
     get type(): "cpu";
     /**
@@ -18,13 +18,13 @@ export class CPUNode<T = any> extends BaseNode<T> {
      */
     get duration(): number;
     /**
-     * @return {LH.TraceEvent}
+     * @return {Lantern.TraceEvent}
      */
-    get event(): LH.TraceEvent;
+    get event(): Lantern.TraceEvent;
     /**
-     * @return {LH.TraceEvent[]}
+     * @return {Lantern.TraceEvent[]}
      */
-    get childEvents(): LH.TraceEvent[];
+    get childEvents(): Lantern.TraceEvent[];
     /**
      * Returns true if this node contains a Layout task.
      * @return {boolean}
@@ -40,5 +40,5 @@ export class CPUNode<T = any> extends BaseNode<T> {
     cloneWithoutRelationships(): CPUNode;
 }
 import { BaseNode } from './base-node.js';
-import * as LH from '../../../types/lh.js';
+import * as Lantern from './types/lantern.js';
 //# sourceMappingURL=cpu-node.d.ts.map

package/core/lib/lantern/cpu-node.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as LH from '../../../types/lh.js';
+import * as Lantern from './types/lantern.js';
 import {BaseNode} from './base-node.js';
 
 /**
@@ -13,8 +13,8 @@ import {BaseNode} from './base-node.js';
  */
 class CPUNode extends BaseNode {
   /**
-   * @param {LH.TraceEvent} parentEvent
-   * @param {LH.TraceEvent[]=} childEvents
+   * @param {Lantern.TraceEvent} parentEvent
+   * @param {Lantern.TraceEvent[]=} childEvents
    * @param {number=} correctedEndTs
    */
   constructor(parentEvent, childEvents = [], correctedEndTs) {
@@ -53,14 +53,14 @@ class CPUNode extends BaseNode {
   }
 
   /**
-   * @return {LH.TraceEvent}
+   * @return {Lantern.TraceEvent}
    */
   get event() {
     return this._event;
   }
 
   /**
-   * @return {LH.TraceEvent[]}
+   * @return {Lantern.TraceEvent[]}
    */
   get childEvents() {
     return this._childEvents;

package/core/lib/lantern/lantern.d.ts

@@ -1,13 +1,50 @@
-export type MetricName = import('@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js').MetricName;
-export type MetricScore = import('@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js').MetricScore;
-/** @typedef {import('@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js').MetricName} MetricName */
-/** @typedef {import('@paulirish/trace_engine/models/trace/handlers/PageLoadMetricsHandler.js').MetricScore} MetricScore */
-/** @type {LH.Util.SelfMap<LH.Crdp.Network.ResourceType>} */
-export const NetworkRequestTypes: LH.Util.SelfMap<LH.Crdp.Network.ResourceType>;
-/**
- * @param {LH.Artifacts.TraceEngineResult} traceEngineResult
- * @return {Lantern.Simulation.ProcessedNavigation}
- */
-export function createProcessedNavigation(traceEngineResult: LH.Artifacts.TraceEngineResult): Lantern.Simulation.ProcessedNavigation;
+/** @type {Lantern.Util.SelfMap<Lantern.ResourceType>} */
+export const NetworkRequestTypes: Lantern.Util.SelfMap<Lantern.ResourceType>;
+export namespace constants {
+    export { throttling };
+}
 import * as Lantern from './types/lantern.js';
+declare namespace throttling {
+    export { DEVTOOLS_RTT_ADJUSTMENT_FACTOR };
+    export { DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR };
+    export namespace mobileSlow4G {
+        const rttMs: number;
+        const throughputKbps: number;
+        const requestLatencyMs: number;
+        const downloadThroughputKbps: number;
+        const uploadThroughputKbps: number;
+        const cpuSlowdownMultiplier: number;
+    }
+    export namespace mobileRegular3G {
+        const rttMs_1: number;
+        export { rttMs_1 as rttMs };
+        const throughputKbps_1: number;
+        export { throughputKbps_1 as throughputKbps };
+        const requestLatencyMs_1: number;
+        export { requestLatencyMs_1 as requestLatencyMs };
+        const downloadThroughputKbps_1: number;
+        export { downloadThroughputKbps_1 as downloadThroughputKbps };
+        const uploadThroughputKbps_1: number;
+        export { uploadThroughputKbps_1 as uploadThroughputKbps };
+        const cpuSlowdownMultiplier_1: number;
+        export { cpuSlowdownMultiplier_1 as cpuSlowdownMultiplier };
+    }
+    export namespace desktopDense4G {
+        const rttMs_2: number;
+        export { rttMs_2 as rttMs };
+        const throughputKbps_2: number;
+        export { throughputKbps_2 as throughputKbps };
+        const cpuSlowdownMultiplier_2: number;
+        export { cpuSlowdownMultiplier_2 as cpuSlowdownMultiplier };
+        const requestLatencyMs_2: number;
+        export { requestLatencyMs_2 as requestLatencyMs };
+        const downloadThroughputKbps_2: number;
+        export { downloadThroughputKbps_2 as downloadThroughputKbps };
+        const uploadThroughputKbps_2: number;
+        export { uploadThroughputKbps_2 as uploadThroughputKbps };
+    }
+}
+declare const DEVTOOLS_RTT_ADJUSTMENT_FACTOR: 3.75;
+declare const DEVTOOLS_THROUGHPUT_ADJUSTMENT_FACTOR: 0.9;
+export {};
 //# sourceMappingURL=lantern.d.ts.map