lighthouse 12.0.0-dev.20240610 → 12.0.0-dev.20240612

package/core/computed/network-analysis.js

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
-import {NetworkAnalyzer} from '../lib/lantern/simulator/network-analyzer.js';
 import {NetworkRecords} from './network-records.js';
 
 class NetworkAnalysis {
@@ -16,7 +16,7 @@ class NetworkAnalysis {
    */
   static async compute_(devtoolsLog, context) {
     const records = await NetworkRecords.request(devtoolsLog, context);
-    return NetworkAnalyzer.analyze(records);
+    return Lantern.Simulation.NetworkAnalyzer.analyze(records);
   }
 }
 

package/core/computed/page-dependency-graph.d.ts

@@ -1,5 +1,5 @@
 export { PageDependencyGraphComputed as PageDependencyGraph };
-export type Node = import('../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>;
+export type Node = import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>;
 declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
     request: (dependencies: {
         trace: LH.Trace;
@@ -11,7 +11,7 @@ declare const PageDependencyGraphComputed: typeof PageDependencyGraph & {
     }>) => Promise<Node>;
 };
 import { NetworkRequest } from '../lib/network-request.js';
-/** @typedef {import('../lib/lantern/base-node.js').Node<LH.Artifacts.NetworkRequest>} Node */
+/** @typedef {import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 declare class PageDependencyGraph {
     /**
      * @param {{trace: LH.Trace, devtoolsLog: LH.DevtoolsLog, URL: LH.Artifacts['URL'], fromTrace?: boolean}} data

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

@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
-import {PageDependencyGraph as LanternPageDependencyGraph} from '../lib/lantern/page-dependency-graph.js';
 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 */
+/** @typedef {import('../lib/lantern/BaseNode.js').Node<LH.Artifacts.NetworkRequest>} Node */
 
 class PageDependencyGraph {
   /**
@@ -30,14 +29,15 @@ class PageDependencyGraph {
     if (data.fromTrace) {
       const traceEngineResult = await TraceEngineResult.request({trace}, context);
       const traceEngineData = traceEngineResult.data;
-      const requests = TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
+      const requests =
+        Lantern.TraceEngineComputationData.createNetworkRequests(trace, traceEngineData);
       const graph =
-        TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
+        Lantern.TraceEngineComputationData.createGraph(requests, trace, traceEngineData, URL);
       return graph;
     }
 
     const lanternRequests = networkRecords.map(NetworkRequest.asLanternNetworkRequest);
-    return LanternPageDependencyGraph.createGraph(mainThreadEvents, lanternRequests, URL);
+    return Lantern.PageDependencyGraph.createGraph(mainThreadEvents, lanternRequests, URL);
   }
 }
 

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,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../lib/lantern/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 '../lib/lantern/tbt-utils.js';
+
+const {calculateTbtImpactForEvent} = Lantern.TBTUtils;
 
 class TBTImpactTasks {
   /**
@@ -132,7 +134,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/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.Simulation.Constants.throttling;
 
 /**
  * @type {Required<LH.SharedFlagsSettings['screenEmulation']>}

package/core/lib/asset-saver.js

@@ -12,7 +12,7 @@ import {createGzip, gunzipSync} from 'zlib';
 
 import log from 'lighthouse-logger';
 
-import {Simulator} from './lantern/simulator/simulator.js';
+import * as Lantern from './lantern/lantern.js';
 import lanternTraceSaver from './lantern-trace-saver.js';
 import {MetricTraceEvents} from './traces/metric-trace-events.js';
 import {NetworkAnalysis} from '../computed/network-analysis.js';
@@ -449,7 +449,7 @@ function saveDevtoolsLog(devtoolsLog, devtoolLogFilename, options = {}) {
 async function saveLanternDebugTraces(pathWithBasename) {
   if (!process.env.LANTERN_DEBUG) return;
 
-  for (const [label, nodeTimings] of Simulator.ALL_NODE_TIMINGS) {
+  for (const [label, nodeTimings] of Lantern.Simulation.Simulator.ALL_NODE_TIMINGS) {
     if (lanternTraceSaver.simulationNamesToIgnore.includes(label)) continue;
 
     const traceFilename = `${pathWithBasename}-${label}${traceSuffix}`;

package/core/lib/lantern/{base-node.d.ts → BaseNode.d.ts}

@@ -2,7 +2,7 @@
  * A union of all types derived from BaseNode, allowing type check discrimination
  * based on `node.type`. If a new node type is created, it should be added here.
  */
-export type Node<T = any> = import('./cpu-node.js').CPUNode<T> | import('./network-node.js').NetworkNode<T>;
+export type Node<T = any> = import('./CpuNode.js').CPUNode<T> | import('./NetworkNode.js').NetworkNode<T>;
 /**
  * @license
  * Copyright 2017 Google LLC
@@ -12,7 +12,7 @@ export type Node<T = any> = import('./cpu-node.js').CPUNode<T> | import('./netwo
  * A union of all types derived from BaseNode, allowing type check discrimination
  * based on `node.type`. If a new node type is created, it should be added here.
  * @template [T=any]
- * @typedef {import('./cpu-node.js').CPUNode<T> | import('./network-node.js').NetworkNode<T>} Node
+ * @typedef {import('./CpuNode.js').CPUNode<T> | import('./NetworkNode.js').NetworkNode<T>} Node
  */
 /**
  * @fileoverview This class encapsulates logic for handling resources and tasks used to model the
@@ -30,6 +30,10 @@ export type Node<T = any> = import('./cpu-node.js').CPUNode<T> | import('./netwo
  * @template [T=any]
  */
 export class BaseNode<T = any> {
+    static TYPES: {
+        NETWORK: 'network';
+        CPU: 'cpu';
+    };
     /**
      * Returns whether the given node has a cycle in its dependent graph by performing a DFS.
      * @param {Node} node
@@ -156,10 +160,4 @@ export class BaseNode<T = any> {
      */
     canDependOn(node: Node): boolean;
 }
-export namespace BaseNode {
-    namespace TYPES {
-        const NETWORK: 'network';
-        const CPU: 'cpu';
-    }
-}
-//# sourceMappingURL=base-node.d.ts.map
+//# sourceMappingURL=BaseNode.d.ts.map

package/core/lib/lantern/{base-node.js → BaseNode.js}

@@ -8,7 +8,7 @@
  * A union of all types derived from BaseNode, allowing type check discrimination
  * based on `node.type`. If a new node type is created, it should be added here.
  * @template [T=any]
- * @typedef {import('./cpu-node.js').CPUNode<T> | import('./network-node.js').NetworkNode<T>} Node
+ * @typedef {import('./CpuNode.js').CPUNode<T> | import('./NetworkNode.js').NetworkNode<T>} Node
  */
 
 /**
@@ -28,6 +28,11 @@
  * @template [T=any]
  */
 class BaseNode {
+  static TYPES = /** @type {{NETWORK: 'network', CPU: 'cpu'}} */({
+    NETWORK: 'network',
+    CPU: 'cpu',
+  });
+
   /**
    * @param {string} id
    */
@@ -361,9 +366,4 @@ class BaseNode {
   }
 }
 
-BaseNode.TYPES = /** @type {{NETWORK: 'network', CPU: 'cpu'}} */({
-  NETWORK: 'network',
-  CPU: 'cpu',
-});
-
 export {BaseNode};