lighthouse 11.7.0-dev.20240414 → 11.7.0-dev.20240415

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

@@ -7,8 +7,8 @@
 import * as Lantern from '../types/lantern.js';
 import {Metric} from '../metric.js';
 import {BaseNode} from '../base-node.js';
-// TODO(15841): move this default config value into lib/lantern
-import {throttling as defaultThrottling} from '../../../config/constants.js';
+
+const mobileSlow4GRtt = 150;
 
 /** @typedef {import('../base-node.js').Node} Node */
 
@@ -44,7 +44,7 @@ class SpeedIndex extends Metric {
     //      lantern test data set. See core/scripts/test-lantern.sh for more detail.
     // While the coefficients haven't been analyzed at the interpolated points, it's our current best effort.
     const defaultCoefficients = this.COEFFICIENTS;
-    const defaultRttExcess = defaultThrottling.mobileSlow4G.rttMs - 30;
+    const defaultRttExcess = mobileSlow4GRtt - 30;
     const multiplier = Math.max((rttMs - 30) / defaultRttExcess, 0);
 
     return {

package/core/lib/lantern/simulator/network-analyzer.js

@@ -140,15 +140,6 @@ class NetworkAnalyzer {
     const {timing, connectionReused, record} = info;
     if (connectionReused) return;
 
-    // In LR, network records are missing connection timing, but we've smuggled it in via headers.
-    if (global.isLightrider && record.lrStatistics) {
-      if (record.protocol.startsWith('h3')) {
-        return record.lrStatistics.TCPMs;
-      } else {
-        return [record.lrStatistics.TCPMs / 2, record.lrStatistics.TCPMs / 2];
-      }
-    }
-
     const {connectStart, sslStart, sslEnd, connectEnd} = timing;
     if (connectEnd >= 0 && connectStart >= 0 && record.protocol.startsWith('h3')) {
       // These values are equal to sslStart and sslEnd for h3.
@@ -256,9 +247,7 @@ class NetworkAnalyzer {
    */
   static _estimateResponseTimeByOrigin(records, rttByOrigin) {
     return NetworkAnalyzer._estimateValueByOrigin(records, ({record, timing}) => {
-      // Lightrider does not have timings for sendEnd, but we do have this timing which should be
-      // close to the response time.
-      if (global.isLightrider && record.lrStatistics) return record.lrStatistics.requestMs;
+      if (record.serverResponseTime !== undefined) return record.serverResponseTime;
 
       if (!Number.isFinite(timing.receiveHeadersEnd) || timing.receiveHeadersEnd < 0) return;
       if (!Number.isFinite(timing.sendEnd) || timing.sendEnd < 0) return;

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

@@ -67,9 +67,6 @@ export class NetworkRequest<T = any> {
     resourceSize: number;
     fromDiskCache: boolean;
     fromMemoryCache: boolean;
-    // TODO(15841): remove from lantern.
-    /** Extra timing information available only when run in Lightrider. */
-    lrStatistics: LightriderStatistics | undefined;
     finished: boolean;
     statusCode: number;
     /** The network request that this one redirected to */
@@ -80,6 +77,11 @@ export class NetworkRequest<T = any> {
     /** The chain of network requests that redirected to this one */
     redirects: NetworkRequest[] | undefined;
     timing: LH.Crdp.Network.ResourceTiming | undefined;
+    /**
+     * Optional value for how long the server took to respond to this request.
+     * When not provided, the server response time is derived from the timing object.
+     */
+    serverResponseTime: number | undefined;
     resourceType: LH.Crdp.Network.ResourceType | undefined;
     mimeType: string;
     priority: LH.Crdp.Network.ResourcePriority;

package/core/lib/network-request.d.ts

@@ -247,6 +247,7 @@ export class NetworkRequest {
      * is passed in via X-Headers similar to 'X-TotalFetchedSize'.
      */
     _updateTimingsForLightrider(): void;
+    serverResponseTime: number | undefined;
 }
 export namespace NetworkRequest {
     export { HEADER_TCP };

package/core/lib/network-request.js

@@ -536,6 +536,7 @@ class NetworkRequest {
       requestMs: requestMs,
       responseMs: responseMs,
     };
+    this.serverResponseTime = responseMs;
   }
 
   /**
@@ -574,8 +575,35 @@ class NetworkRequest {
    * @return {Lantern.NetworkRequest<NetworkRequest>}
    */
   static asLanternNetworkRequest(record) {
+    // In LR, network records are missing connection timing, but we've smuggled it in via headers.
+    let timing = record.timing;
+    let serverResponseTime;
+    if (global.isLightrider && record.lrStatistics) {
+      if (record.protocol.startsWith('h3')) {
+        // @ts-expect-error We don't need all the properties set.
+        timing = {
+          connectStart: 0,
+          connectEnd: record.lrStatistics.TCPMs,
+        };
+      } else {
+        // @ts-expect-error We don't need all the properties set.
+        timing = {
+          connectStart: 0,
+          sslStart: record.lrStatistics.TCPMs / 2,
+          connectEnd: record.lrStatistics.TCPMs,
+          sslEnd: record.lrStatistics.TCPMs,
+        };
+
+        // Lightrider does not have timings for sendEnd, but we do have this timing which should be
+        // close to the response time.
+        serverResponseTime = record.lrStatistics.requestMs;
+      }
+    }
+
     return {
       ...record,
+      timing,
+      serverResponseTime,
       record,
     };
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "11.7.0-dev.20240414",
+  "version": "11.7.0-dev.20240415",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {