lighthouse 11.7.0-dev.20240418 → 11.7.0-dev.20240419

package/cli/test/smokehouse/__snapshots__/report-assert-test.js.snap

@@ -3,7 +3,7 @@
 exports[`getAssertionReport works (multiple failing) 1`] = `
 "X difference at cumulative-layout-shift audit.details.items.length
               expected: []
-                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444,\\"newEngineResult\\":{\\"cumulativeLayoutShift\\":0.13570762803819444,\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444},\\"newEngineResultDiffered\\":false}]
+                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.09957584751767748,\\"newEngineResult\\":{\\"cumulativeLayoutShift\\":0.09957584751767748,\\"cumulativeLayoutShiftMainFrame\\":0.09957584751767748},\\"newEngineResultDiffered\\":false}]
 
 
   X difference at cumulative-layout-shift audit.details.blah
@@ -15,11 +15,11 @@ exports[`getAssertionReport works (multiple failing) 1`] = `
         \\"id\\": \\"cumulative-layout-shift\\",
         \\"title\\": \\"Cumulative Layout Shift\\",
         \\"description\\": \\"Cumulative Layout Shift measures the movement of visible elements within the viewport. [Learn more about the Cumulative Layout Shift metric](https://web.dev/articles/cls).\\",
-        \\"score\\": 0.8,
+        \\"score\\": 0.9,
         \\"scoreDisplayMode\\": \\"numeric\\",
-        \\"numericValue\\": 0.13570762803819444,
+        \\"numericValue\\": 0.09957584751767748,
         \\"numericUnit\\": \\"unitless\\",
-        \\"displayValue\\": \\"0.136\\",
+        \\"displayValue\\": \\"0.1\\",
         \\"scoringOptions\\": {
           \\"p10\\": 0.1,
           \\"median\\": 0.25
@@ -28,10 +28,10 @@ exports[`getAssertionReport works (multiple failing) 1`] = `
           \\"type\\": \\"debugdata\\",
           \\"items\\": [
             {
-              \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444,
+              \\"cumulativeLayoutShiftMainFrame\\": 0.09957584751767748,
               \\"newEngineResult\\": {
-                \\"cumulativeLayoutShift\\": 0.13570762803819444,
-                \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444
+                \\"cumulativeLayoutShift\\": 0.09957584751767748,
+                \\"cumulativeLayoutShiftMainFrame\\": 0.09957584751767748
               },
               \\"newEngineResultDiffered\\": false
             }
@@ -43,18 +43,18 @@ exports[`getAssertionReport works (multiple failing) 1`] = `
 exports[`getAssertionReport works (trivial failing) 1`] = `
 "X difference at cumulative-layout-shift audit.details.items.length
               expected: []
-                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444,\\"newEngineResult\\":{\\"cumulativeLayoutShift\\":0.13570762803819444,\\"cumulativeLayoutShiftMainFrame\\":0.13570762803819444},\\"newEngineResultDiffered\\":false}]
+                 found: [{\\"cumulativeLayoutShiftMainFrame\\":0.09957584751767748,\\"newEngineResult\\":{\\"cumulativeLayoutShift\\":0.09957584751767748,\\"cumulativeLayoutShiftMainFrame\\":0.09957584751767748},\\"newEngineResultDiffered\\":false}]
 
           found result:
       {
         \\"id\\": \\"cumulative-layout-shift\\",
         \\"title\\": \\"Cumulative Layout Shift\\",
         \\"description\\": \\"Cumulative Layout Shift measures the movement of visible elements within the viewport. [Learn more about the Cumulative Layout Shift metric](https://web.dev/articles/cls).\\",
-        \\"score\\": 0.8,
+        \\"score\\": 0.9,
         \\"scoreDisplayMode\\": \\"numeric\\",
-        \\"numericValue\\": 0.13570762803819444,
+        \\"numericValue\\": 0.09957584751767748,
         \\"numericUnit\\": \\"unitless\\",
-        \\"displayValue\\": \\"0.136\\",
+        \\"displayValue\\": \\"0.1\\",
         \\"scoringOptions\\": {
           \\"p10\\": 0.1,
           \\"median\\": 0.25
@@ -63,10 +63,10 @@ exports[`getAssertionReport works (trivial failing) 1`] = `
           \\"type\\": \\"debugdata\\",
           \\"items\\": [
             {
-              \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444,
+              \\"cumulativeLayoutShiftMainFrame\\": 0.09957584751767748,
               \\"newEngineResult\\": {
-                \\"cumulativeLayoutShift\\": 0.13570762803819444,
-                \\"cumulativeLayoutShiftMainFrame\\": 0.13570762803819444
+                \\"cumulativeLayoutShift\\": 0.09957584751767748,
+                \\"cumulativeLayoutShiftMainFrame\\": 0.09957584751767748
               },
               \\"newEngineResultDiffered\\": false
             }

package/core/audits/dobetterweb/uses-http2.js

@@ -78,11 +78,9 @@ class UsesHTTP2Audit extends Audit {
     options = Object.assign({label: ''}, options);
     const beforeLabel = `${this.meta.id}-${options.label}-before`;
     const afterLabel = `${this.meta.id}-${options.label}-after`;
-    const flexibleOrdering = true;
 
     const urlsToChange = new Set(results.map(result => result.url));
-    const simulationBefore =
-      simulator.simulate(graph, {label: beforeLabel, flexibleOrdering});
+    const simulationBefore = simulator.simulate(graph, {label: beforeLabel});
 
     // Update all the protocols to reflect implementing our recommendations
     /** @type {Map<string, string>} */
@@ -95,7 +93,7 @@ class UsesHTTP2Audit extends Audit {
       node.request.protocol = 'h2';
     });
 
-    const simulationAfter = simulator.simulate(graph, {label: afterLabel, flexibleOrdering});
+    const simulationAfter = simulator.simulate(graph, {label: afterLabel});
 
     // Restore the original protocol after we've done our simulation
     graph.traverse(node => {

package/core/audits/prioritize-lcp-image.js

@@ -194,8 +194,8 @@ class PrioritizeLcpImage extends Audit {
     modifiedLCPNode.removeAllDependencies();
     modifiedLCPNode.addDependency(mainDocumentNode);
 
-    const simulationBeforeChanges = simulator.simulate(graph, {flexibleOrdering: true});
-    const simulationAfterChanges = simulator.simulate(modifiedGraph, {flexibleOrdering: true});
+    const simulationBeforeChanges = simulator.simulate(graph);
+    const simulationAfterChanges = simulator.simulate(modifiedGraph);
     const lcpTimingsBefore = simulationBeforeChanges.nodeTimings.get(lcpNode);
     if (!lcpTimingsBefore) throw new Error('Impossible - node timings should never be undefined');
     const lcpTimingsAfter = simulationAfterChanges.nodeTimings.get(modifiedLCPNode);

package/core/audits/uses-rel-preload.js

@@ -143,9 +143,9 @@ class UsesRelPreloadAudit extends Audit {
       return {wastedMs: 0, results: []};
     }
 
-    // Preload changes the ordering of requests, simulate the original graph with flexible ordering
+    // Preload changes the ordering of requests, simulate the original graph
     // to have a reasonable baseline for comparison.
-    const simulationBeforeChanges = simulator.simulate(graph, {flexibleOrdering: true});
+    const simulationBeforeChanges = simulator.simulate(graph);
     const modifiedGraph = graph.cloneWithRelationships();
 
     /** @type {Array<LH.Gatherer.Simulation.GraphNetworkNode>} */
@@ -174,8 +174,8 @@ class UsesRelPreloadAudit extends Audit {
       node.addDependency(mainDocumentNode);
     }
 
-    // Once we've modified the dependencies, simulate the new graph with flexible ordering.
-    const simulationAfterChanges = simulator.simulate(modifiedGraph, {flexibleOrdering: true});
+    // Once we've modified the dependencies, simulate the new graph.
+    const simulationAfterChanges = simulator.simulate(modifiedGraph);
     const originalNodesByRecord = Array.from(simulationBeforeChanges.nodeTimings.keys())
         // @ts-expect-error we don't care if all nodes without a record collect on `undefined`
         .reduce((map, node) => map.set(node.record, node), new Map());

package/core/lib/lantern/metric.js

@@ -101,19 +101,15 @@ class Metric {
     const optimisticGraph = this.getOptimisticGraph(graph, processedNavigation);
     const pessimisticGraph = this.getPessimisticGraph(graph, processedNavigation);
 
-    /** @type {{flexibleOrdering?: boolean, label?: string}} */
     let simulateOptions = {label: `optimistic${metricName}`};
     const optimisticSimulation = simulator.simulate(optimisticGraph, simulateOptions);
 
-    simulateOptions = {label: `optimisticFlex${metricName}`, flexibleOrdering: true};
-    const optimisticFlexSimulation = simulator.simulate(optimisticGraph, simulateOptions);
-
     simulateOptions = {label: `pessimistic${metricName}`};
     const pessimisticSimulation = simulator.simulate(pessimisticGraph, simulateOptions);
 
     const optimisticEstimate = this.getEstimateFromSimulation(
-      optimisticSimulation.timeInMs < optimisticFlexSimulation.timeInMs ?
-        optimisticSimulation : optimisticFlexSimulation, {...extras, optimistic: true}
+      optimisticSimulation,
+      {...extras, optimistic: true}
     );
 
     const pessimisticEstimate = this.getEstimateFromSimulation(

package/core/lib/lantern/metrics/interactive.js

@@ -21,8 +21,8 @@ class Interactive extends Metric {
   static get COEFFICIENTS() {
     return {
       intercept: 0,
-      optimistic: 0.5,
-      pessimistic: 0.5,
+      optimistic: 0.45,
+      pessimistic: 0.55,
     };
   }
 

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

@@ -18,12 +18,11 @@ class SpeedIndex extends Metric {
    */
   static get COEFFICIENTS() {
     return {
-      // Negative intercept is OK because estimate is Math.max(FCP, Speed Index) and
-      // the optimistic estimate is based on the real observed speed index rather than a real
-      // lantern graph.
-      intercept: -250,
+      // Note that the optimistic estimate is based on the real observed speed index rather than a
+      // real lantern graph (and the final estimate will be Math.max(FCP, Speed Index)).
+      intercept: 0,
       optimistic: 1.4,
-      pessimistic: 0.65,
+      pessimistic: 0.4,
     };
   }
 

package/core/lib/lantern/simulator/connection-pool.d.ts

@@ -19,27 +19,17 @@ export class ConnectionPool {
     _initializeConnections(): void;
     /**
      * @param {Array<TcpConnection>} connections
-     * @param {{ignoreConnectionReused?: boolean, observedConnectionWasReused: boolean}} options
      */
-    _findAvailableConnectionWithLargestCongestionWindow(connections: Array<TcpConnection>, options: {
-        ignoreConnectionReused?: boolean | undefined;
-        observedConnectionWasReused: boolean;
-    }): TcpConnection | null;
+    _findAvailableConnectionWithLargestCongestionWindow(connections: Array<TcpConnection>): TcpConnection | null;
     /**
      * This method finds an available connection to the origin specified by the network record or null
      * if no connection was available. If returned, connection will not be available for other network
      * records until release is called.
      *
-     * If ignoreConnectionReused is true, acquire will consider all connections not in use as available.
-     * Otherwise, only connections that have matching "warmth" are considered available.
-     *
      * @param {Lantern.NetworkRequest} record
-     * @param {{ignoreConnectionReused?: boolean}} options
      * @return {?TcpConnection}
      */
-    acquire(record: Lantern.NetworkRequest, options?: {
-        ignoreConnectionReused?: boolean;
-    }): TcpConnection | null;
+    acquire(record: Lantern.NetworkRequest): TcpConnection | null;
     /**
      * Return the connection currently being used to fetch a record. If no connection
      * currently being used for this record, an error will be thrown.

package/core/lib/lantern/simulator/connection-pool.js

@@ -85,24 +85,13 @@ export class ConnectionPool {
 
   /**
    * @param {Array<TcpConnection>} connections
-   * @param {{ignoreConnectionReused?: boolean, observedConnectionWasReused: boolean}} options
    */
-  _findAvailableConnectionWithLargestCongestionWindow(connections, options) {
-    const {ignoreConnectionReused, observedConnectionWasReused} = options;
-
+  _findAvailableConnectionWithLargestCongestionWindow(connections) {
     /** @type {TcpConnection|null} */
     let maxConnection = null;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
 
-      // Normally, we want to make sure the connection warmth matches the state of the record
-      // we're acquiring for. Do this check first since it's the common case and cheaper than our
-      // "in use" check below.
-      // Use the _warmed property instead of the getter because this is a surprisingly hot code path.
-      if (!ignoreConnectionReused && connection._warmed !== observedConnectionWasReused) {
-        continue;
-      }
-
       // Connections that are in use are never available.
       if (this._connectionsInUse.has(connection)) {
         continue;
@@ -121,23 +110,15 @@ export class ConnectionPool {
    * if no connection was available. If returned, connection will not be available for other network
    * records until release is called.
    *
-   * If ignoreConnectionReused is true, acquire will consider all connections not in use as available.
-   * Otherwise, only connections that have matching "warmth" are considered available.
-   *
    * @param {Lantern.NetworkRequest} record
-   * @param {{ignoreConnectionReused?: boolean}} options
    * @return {?TcpConnection}
    */
-  acquire(record, options = {}) {
+  acquire(record) {
     if (this._connectionsByRecord.has(record)) throw new Error('Record already has a connection');
 
     const origin = record.parsedURL.securityOrigin;
-    const observedConnectionWasReused = !!this._connectionReusedByRequestId.get(record.requestId);
     const connections = this._connectionsByOrigin.get(origin) || [];
-    const connectionToUse = this._findAvailableConnectionWithLargestCongestionWindow(connections, {
-      ignoreConnectionReused: options.ignoreConnectionReused,
-      observedConnectionWasReused,
-    });
+    const connectionToUse = this._findAvailableConnectionWithLargestCongestionWindow(connections);
 
     if (!connectionToUse) return null;
 

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

@@ -29,7 +29,6 @@ export class Simulator<T = any> {
     _layoutTaskMultiplier: number;
     /** @type {Array<Node>} */
     _cachedNodeListByStartPosition: Array<Node>;
-    _flexibleOrdering: boolean;
     _nodeTimings: SimulatorTimingMap;
     /** @type {Map<string, number>} */
     _numberInProgressByType: Map<string, number>;
@@ -131,17 +130,16 @@ export class Simulator<T = any> {
      * Estimates the time taken to process all of the graph's nodes, returns the overall time along with
      * each node annotated by start/end times.
      *
-     * If flexibleOrdering is set, simulator/connection pool are allowed to deviate from what was
+     * Simulator/connection pool are allowed to deviate from what was
      * observed in the trace/devtoolsLog and start requests as soon as they are queued (i.e. do not
      * wait around for a warm connection to be available if the original record was fetched on a warm
      * connection).
      *
      * @param {Node} graph
-     * @param {{flexibleOrdering?: boolean, label?: string}=} options
+     * @param {{label?: string}=} options
      * @return {Lantern.Simulation.Result<T>}
      */
     simulate(graph: Node, options?: {
-        flexibleOrdering?: boolean;
         label?: string;
     } | undefined): Lantern.Simulation.Result<T>;
     /**

package/core/lib/lantern/simulator/simulator.js

@@ -80,7 +80,6 @@ class Simulator {
     this._cachedNodeListByStartPosition = [];
 
     // Properties reset on every `.simulate` call but duplicated here for type checking
-    this._flexibleOrdering = false;
     this._nodeTimings = new SimulatorTimingMap();
     /** @type {Map<string, number>} */
     this._numberInProgressByType = new Map();
@@ -197,9 +196,7 @@ class Simulator {
    * @return {?TcpConnection}
    */
   _acquireConnection(record) {
-    return this._connectionPool.acquire(record, {
-      ignoreConnectionReused: this._flexibleOrdering,
-    });
+    return this._connectionPool.acquire(record);
   }
 
   /**
@@ -425,13 +422,13 @@ class Simulator {
    * Estimates the time taken to process all of the graph's nodes, returns the overall time along with
    * each node annotated by start/end times.
    *
-   * If flexibleOrdering is set, simulator/connection pool are allowed to deviate from what was
+   * Simulator/connection pool are allowed to deviate from what was
    * observed in the trace/devtoolsLog and start requests as soon as they are queued (i.e. do not
    * wait around for a warm connection to be available if the original record was fetched on a warm
    * connection).
    *
    * @param {Node} graph
-   * @param {{flexibleOrdering?: boolean, label?: string}=} options
+   * @param {{label?: string}=} options
    * @return {Lantern.Simulation.Result<T>}
    */
   simulate(graph, options) {
@@ -441,11 +438,9 @@ class Simulator {
 
     options = Object.assign({
       label: undefined,
-      flexibleOrdering: false,
     }, options);
 
     // initialize the necessary data containers
-    this._flexibleOrdering = !!options.flexibleOrdering;
     this._dns = new DNSCache({rtt: this._rtt});
     this._initializeConnectionPool(graph);
     this._initializeAuxiliaryData();
@@ -470,11 +465,9 @@ class Simulator {
       }
 
       if (!nodesInProgress.size) {
-        // interplay between fromDiskCache and connectionReused can be incorrect
-        // proceed with flexibleOrdering if we can, otherwise give up
-        if (this._flexibleOrdering) throw new Error('Failed to start a node');
-        this._flexibleOrdering = true;
-        continue;
+        // Interplay between fromDiskCache and connectionReused can be incorrect,
+        // have to give up.
+        throw new Error('Failed to start a node');
       }
 
       // set the available throughput for all connections based on # inflight

package/core/lib/lantern-trace-saver.js

@@ -255,7 +255,6 @@ export default {
     'unlabeled',
     // These node timings should be nearly identical to the ones produced for Interactive
     'optimisticSpeedIndex',
-    'optimisticFlexSpeedIndex',
     'pessimisticSpeedIndex',
   ],
   convertNodeTimingsToTrace,