lighthouse 11.7.0-dev.20240410 → 11.7.0-dev.20240412

package/core/lib/lantern/metrics/first-meaningful-paint.js

@@ -6,8 +6,6 @@
 
 import * as Lantern from '../types/lantern.js';
 import {Metric} from '../metric.js';
-// TODO(15841): don't use LighthouseError
-import {LighthouseError} from '../../lh-error.js';
 import {FirstContentfulPaint} from './first-contentful-paint.js';
 
 /** @typedef {import('../base-node.js').Node} Node */
@@ -32,7 +30,7 @@ class FirstMeaningfulPaint extends Metric {
   static getOptimisticGraph(dependencyGraph, processedNavigation) {
     const fmp = processedNavigation.timestamps.firstMeaningfulPaint;
     if (!fmp) {
-      throw new LighthouseError(LighthouseError.errors.NO_FMP);
+      throw new Error('NO_FMP');
     }
     return FirstContentfulPaint.getFirstPaintBasedGraph(dependencyGraph, {
       cutoffTimestamp: fmp,
@@ -51,7 +49,7 @@ class FirstMeaningfulPaint extends Metric {
   static getPessimisticGraph(dependencyGraph, processedNavigation) {
     const fmp = processedNavigation.timestamps.firstMeaningfulPaint;
     if (!fmp) {
-      throw new LighthouseError(LighthouseError.errors.NO_FMP);
+      throw new Error('NO_FMP');
     }
 
     return FirstContentfulPaint.getFirstPaintBasedGraph(dependencyGraph, {

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

@@ -37,7 +37,7 @@ class Interactive extends Metric {
     return dependencyGraph.cloneWithRelationships(node => {
       // Include everything that might be a long task
       if (node.type === BaseNode.TYPES.CPU) {
-        return node.event.dur > minimumCpuTaskDuration;
+        return node.duration > minimumCpuTaskDuration;
       }
 
       // Include all scripts and high priority requests, exclude all images

package/core/lib/lantern/metrics/largest-contentful-paint.js

@@ -6,8 +6,8 @@
 
 import * as Lantern from '../types/lantern.js';
 import {Metric} from '../metric.js';
-import {LighthouseError} from '../../../lib/lh-error.js';
 import {FirstContentfulPaint} from './first-contentful-paint.js';
+import {LanternError} from '../lantern-error.js';
 
 /** @typedef {import('../base-node.js').Node} Node */
 
@@ -45,7 +45,7 @@ class LargestContentfulPaint extends Metric {
   static getOptimisticGraph(dependencyGraph, processedNavigation) {
     const lcp = processedNavigation.timestamps.largestContentfulPaint;
     if (!lcp) {
-      throw new LighthouseError(LighthouseError.errors.NO_LCP);
+      throw new LanternError('NO_LCP');
     }
 
     return FirstContentfulPaint.getFirstPaintBasedGraph(dependencyGraph, {
@@ -62,7 +62,7 @@ class LargestContentfulPaint extends Metric {
   static getPessimisticGraph(dependencyGraph, processedNavigation) {
     const lcp = processedNavigation.timestamps.largestContentfulPaint;
     if (!lcp) {
-      throw new LighthouseError(LighthouseError.errors.NO_LCP);
+      throw new LanternError('NO_LCP');
     }
 
     return FirstContentfulPaint.getFirstPaintBasedGraph(dependencyGraph, {

package/core/lib/lantern/page-dependency-graph.js

@@ -128,6 +128,9 @@ class PageDependencyGraph {
         continue;
       }
 
+      /** @type {number|undefined} */
+      let correctedEndTs = undefined;
+
       // Capture all events that occurred within the task
       /** @type {Array<LH.TraceEvent>} */
       const children = [];
@@ -136,10 +139,19 @@ class PageDependencyGraph {
         i < mainThreadEvents.length && mainThreadEvents[i].ts < endTime;
         i++
       ) {
+        // Temporary fix for a Chrome bug where some RunTask events can be overlapping.
+        // We correct that here be ensuring each RunTask ends at least 1 microsecond before the next
+        // https://github.com/GoogleChrome/lighthouse/issues/15896
+        // https://issues.chromium.org/issues/329678173
+        if (TraceProcessor.isScheduleableTask(mainThreadEvents[i]) && mainThreadEvents[i].dur) {
+          correctedEndTs = mainThreadEvents[i].ts - 1;
+          break;
+        }
+
         children.push(mainThreadEvents[i]);
       }
 
-      nodes.push(new CPUNode(evt, children));
+      nodes.push(new CPUNode(evt, children, correctedEndTs));
     }
 
     return nodes;
@@ -359,7 +371,7 @@ class PageDependencyGraph {
         isFirst = foundFirstParse = true;
       }
 
-      if (isFirst || node.event.dur >= minimumEvtDur) {
+      if (isFirst || node.duration >= minimumEvtDur) {
         // Don't prune this node. The task is long / important so it will impact simulation.
         continue;
       }

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

@@ -276,7 +276,7 @@ class Simulator {
       ? this._layoutTaskMultiplier
       : this._cpuSlowdownMultiplier;
     const totalDuration = Math.min(
-      Math.round(cpuNode.event.dur / 1000 * multiplier),
+      Math.round(cpuNode.duration / 1000 * multiplier),
       DEFAULT_MAXIMUM_CPU_TASK_DURATION
     );
     const estimatedTimeElapsed = totalDuration - timingData.timeElapsed;

package/core/lib/lh-error.js

@@ -76,13 +76,13 @@ const UIStrings = {
   criTimeout: 'Timeout waiting for initial Debugger Protocol connection.',
   /**
    * @description Error message explaining that a resource that was required for testing was never collected. "artifactName" will be replaced with the name of the resource that wasn't collected.
-   * @example {WebAppManifest} artifactName
+   * @example {MainDocumentContent} artifactName
    * */
   missingRequiredArtifact: 'Required {artifactName} gatherer did not run.',
   /**
    * @description Error message explaining that there was an error while trying to collect a resource that was required for testing. "artifactName" will be replaced with the name of the resource that wasn't collected; "errorMessage" will be replaced with a string description of the error that occurred.
-   * @example {WebAppManifest} artifactName
-   * @example {Manifest invalid} errorMessage
+   * @example {MainDocumentContent} artifactName
+   * @example {Could not find main document} errorMessage
    * */
   erroredRequiredArtifact: 'Required {artifactName} gatherer encountered an error: {errorMessage}',
 

package/core/runner.js

@@ -106,7 +106,6 @@ class Runner {
           networkUserAgent: artifacts.NetworkUserAgent,
           hostUserAgent: artifacts.HostUserAgent,
           benchmarkIndex: artifacts.BenchmarkIndex,
-          benchmarkIndexes: artifacts.BenchmarkIndexes,
           credits,
         },
         audits: auditResultsById,

package/package.json

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

package/report/renderer/report-renderer.js

@@ -203,7 +203,7 @@ export class ReportRenderer {
    * @return {!DocumentFragment[]}
    */
   _renderScoreGauges(report, categoryRenderer, specificCategoryRenderers) {
-    // Group gauges in this order: default, pwa, plugins.
+    // Group gauges in this order: default, plugins.
     const defaultGauges = [];
     const pluginGauges = [];
 

package/tsconfig.json

@@ -48,7 +48,6 @@
     "core/test/gather/gatherers/devtools-log-test.js",
     "core/test/gather/gatherers/dobetterweb/optimized-images-test.js",
     "core/test/gather/gatherers/dobetterweb/response-compression-test.js",
-    "core/test/gather/gatherers/dobetterweb/tags-blocking-first-paint-test.js",
     "core/test/gather/gatherers/full-page-screenshot-test.js",
     "core/test/gather/gatherers/global-listeners-test.js",
     "core/test/gather/gatherers/html-without-javascript-test.js",
@@ -57,7 +56,6 @@
     "core/test/gather/gatherers/offline-test.js",
     "core/test/gather/gatherers/runtime-exceptions-test.js",
     "core/test/gather/gatherers/seo/font-size-test.js",
-    "core/test/gather/gatherers/service-worker-test.js",
     "core/test/gather/gatherers/source-maps-test.js",
     "core/test/gather/gatherers/stack-collector-test.js",
     "core/test/gather/gatherers/start-url-test.js",

package/types/artifacts.d.ts

@@ -16,6 +16,7 @@ import speedline from 'speedline-core';
 import * as CDTSourceMap from '../core/lib/cdt/generated/SourceMap.js';
 import {ArbitraryEqualityMap} from '../core/lib/arbitrary-equality-map.js';
 import type { TaskNode as _TaskNode } from '../core/lib/tracehouse/main-thread-tasks.js';
+import type {EnabledHandlers} from '../core/computed/trace-engine-result.js';
 import AuditDetails from './lhr/audit-details.js'
 import Config from './config.js';
 import Gatherer from './gatherer.js';
@@ -45,8 +46,6 @@ interface UniversalBaseArtifacts {
   LighthouseRunWarnings: Array<string | IcuMessage>;
   /** The benchmark index that indicates rough device class. */
   BenchmarkIndex: number;
-  /** Many benchmark indexes. Many. */
-  BenchmarkIndexes?: number[];
   /** An object containing information about the testing configuration used by Lighthouse. */
   settings: Config.Settings;
   /** The timing instrumentation of the gather portion of a run. */
@@ -79,18 +78,20 @@ interface ContextualBaseArtifacts {
 interface PublicGathererArtifacts {
   /** ConsoleMessages deprecation and intervention warnings, console API calls, and exceptions logged by Chrome during page load. */
   ConsoleMessages: Artifacts.ConsoleMessage[];
-  /** All the iframe elements in the page. */
-  IFrameElements: Artifacts.IFrameElement[];
-  /** The contents of the main HTML document network resource. */
-  MainDocumentContent: string;
+  /** The primary log of devtools protocol activity. */
+  DevtoolsLog: DevtoolsLog;
   /** Information on size and loading for all the images in the page. Natural size information for `picture` and CSS images is only available if the image was one of the largest 50 images. */
   ImageElements: Artifacts.ImageElement[];
   /** All the link elements on the page or equivalently declared in `Link` headers. @see https://html.spec.whatwg.org/multipage/links.html */
   LinkElements: Artifacts.LinkElement[];
+  /** The contents of the main HTML document network resource. */
+  MainDocumentContent: string;
   /** The values of the <meta> elements in the head. */
   MetaElements: Array<{name?: string, content?: string, property?: string, httpEquiv?: string, charset?: string, node: Artifacts.NodeDetails}>;
   /** Information on all scripts in the page. */
   Scripts: Artifacts.Script[];
+  /** The primary trace taken over the entire run. */
+  Trace: Trace;
   /** The dimensions and devicePixelRatio of the loaded viewport. */
   ViewportDimensions: Artifacts.ViewportDimensions;
 }
@@ -110,8 +111,6 @@ export interface GathererArtifacts extends PublicGathererArtifacts {
   CacheContents: string[];
   /** CSS coverage information for styles used by page's final state. */
   CSSUsage: {rules: Crdp.CSS.RuleUsage[], stylesheets: Artifacts.CSSStyleSheetInfo[]};
-  /** The primary log of devtools protocol activity. */
-  DevtoolsLog: DevtoolsLog;
   /** The log of devtools protocol activity if there was a page load error and Chrome navigated to a `chrome-error://` page. */
   DevtoolsLogError: DevtoolsLog;
   /** Information on the document's doctype(or null if not present), specifically the name, publicId, and systemId.
@@ -121,12 +120,12 @@ export interface GathererArtifacts extends PublicGathererArtifacts {
   DOMStats: Artifacts.DOMStats;
   /** Information on poorly sized font usage and the text affected by it. */
   FontSize: Artifacts.FontSize;
+  /** All the iframe elements in the page. */
+  IFrameElements: Artifacts.IFrameElement[];
   /** All the input elements, including associated form and label elements. */
   Inputs: {inputs: Artifacts.InputElement[]; forms: Artifacts.FormElement[]; labels: Artifacts.LabelElement[]};
   /** Screenshot of the entire page (rather than just the above the fold content). */
   FullPageScreenshot: LHResult.FullPageScreenshot | null;
-  /** Information about event listeners registered on the global object. */
-  GlobalListeners: Array<Artifacts.GlobalListener>;
   /** The issues surfaced in the devtools Issues panel */
   InspectorIssues: Artifacts.InspectorIssues;
   /** JS coverage information for code used during audit. Keyed by script id. */
@@ -142,18 +141,10 @@ export interface GathererArtifacts extends PublicGathererArtifacts {
   RobotsTxt: {status: number|null, content: string|null, errorMessage?: string};
   /** The result of calling the shared trace engine root cause analysis. */
   RootCauses: Artifacts.TraceEngineRootCauses;
-  /** Version information for all ServiceWorkers active after the first page load. */
-  ServiceWorker: {versions: Crdp.ServiceWorker.ServiceWorkerVersion[], registrations: Crdp.ServiceWorker.ServiceWorkerRegistration[]};
   /** Source maps of scripts executed in the page. */
   SourceMaps: Array<Artifacts.SourceMap>;
   /** Information on detected tech stacks (e.g. JS libraries) used by the page. */
   Stacks: Artifacts.DetectedStack[];
-  /** Information on <script> and <link> tags blocking first paint. */
-  TagsBlockingFirstPaint: Artifacts.TagBlockingFirstPaint[];
-  /** Information about tap targets including their position and size. */
-  TapTargets: Artifacts.TapTarget[];
-  /** The primary trace taken over the entire run. */
-  Trace: Trace;
   /** The trace if there was a page load error and Chrome navigated to a `chrome-error://` page. */
   TraceError: Trace;
   /** Elements associated with metrics (ie: Largest Contentful Paint element). */
@@ -189,6 +180,8 @@ declare module Artifacts {
     finalDisplayedUrl: string;
   }
 
+  type Rect = AuditDetails.Rect;
+
   interface NodeDetails {
     lhId: string,
     devtoolsNodePath: string,
@@ -294,19 +287,6 @@ declare module Artifacts {
     content?: string;
   }
 
-  interface ScriptElement {
-    type: string | null
-    src: string | null
-    /** The `id` property of the script element; null if it had no `id` or if `source` is 'network'. */
-    id: string | null
-    async: boolean
-    defer: boolean
-    /** Details for node in DOM for the script element */
-    node: NodeDetails | null
-    /** Where the script was discovered, either in the head, the body, or network records. */
-    source: 'head'|'body'|'network'
-  }
-
   /** @see https://sourcemaps.info/spec.html#h.qz3o9nc69um5 */
   type RawSourceMap = {
     /** File version and must be a positive integer. */
@@ -519,27 +499,6 @@ declare module Artifacts {
     resourceSize: number;
   }
 
-  interface TagBlockingFirstPaint {
-    startTime: number;
-    endTime: number;
-    transferSize: number;
-    tag: {
-      tagName: 'LINK'|'SCRIPT';
-      /** The value of `HTMLLinkElement.href` or `HTMLScriptElement.src`. */
-      url: string;
-      /** A record of when changes to the `HTMLLinkElement.media` attribute occurred and if the new media type matched the page. */
-      mediaChanges?: Array<{href: string, media: string, msSinceHTMLEnd: number, matches: boolean}>;
-    };
-  }
-
-  type Rect = AuditDetails.Rect;
-
-  interface TapTarget {
-    node: NodeDetails;
-    href: string;
-    clientRects: Rect[];
-  }
-
   interface TraceElement {
     traceEventType: 'largest-contentful-paint'|'layout-shift'|'animation'|'responsiveness';
     node: NodeDetails;
@@ -548,7 +507,10 @@ declare module Artifacts {
     type?: string;
   }
 
-  type TraceEngineResult = TraceEngine.Handlers.Types.TraceParseData;
+  interface TraceEngineResult {
+    data: TraceEngine.Handlers.Types.EnabledHandlerDataWithMeta<EnabledHandlers>;
+    insights: TraceEngine.Insights.Types.TraceInsightData<EnabledHandlers>;
+  }
 
   interface TraceEngineRootCauses {
     layoutShifts: Record<number, LayoutShiftRootCausesData>;
@@ -811,18 +773,6 @@ declare module Artifacts {
     node: NodeDetails;
   }
 
-  /** Information about an event listener registered on the global object. */
-  interface GlobalListener {
-    /** Event listener type, limited to those events currently of interest. */
-    type: 'pagehide'|'unload'|'visibilitychange';
-    /** The DevTools protocol script identifier. */
-    scriptId: string;
-    /** Line number in the script (0-based). */
-    lineNumber: number;
-    /** Column number in the script (0-based). */
-    columnNumber: number;
-  }
-
   /** Describes a generic console message. */
   interface BaseConsoleMessage {
     /**

package/types/lhr/lhr.d.ts

@@ -71,8 +71,6 @@ declare module Result {
     networkUserAgent: string;
     /** The benchmark index number that indicates rough device class. */
     benchmarkIndex: number;
-    /** Many benchmark indexes. */
-    benchmarkIndexes?: number[];
     /** The version of libraries with which these results were generated. Ex: axe-core. */
     credits?: Record<string, string|undefined>,
   }

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

@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-/**
- * @param {LH.Gatherer.ProtocolSession} session
- * @return {Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>}
- */
-export function getServiceWorkerVersions(session: LH.Gatherer.ProtocolSession): Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>;
-/**
- * @param {LH.Gatherer.ProtocolSession} session
- * @return {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

@@ -1,52 +0,0 @@
-/**
- * @license
- * Copyright 2021 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @param {LH.Gatherer.ProtocolSession} session
- * @return {Promise<LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent>}
- */
-function getServiceWorkerVersions(session) {
-  return new Promise((resolve, reject) => {
-    /**
-     * @param {LH.Crdp.ServiceWorker.WorkerVersionUpdatedEvent} data
-     */
-    const versionUpdatedListener = data => {
-      // find a service worker with runningStatus that looks like active
-      // on slow connections the serviceworker might still be installing
-      const activateCandidates = data.versions.filter(sw => {
-        return sw.status !== 'redundant';
-      });
-
-      const hasActiveServiceWorker = activateCandidates.find(sw => {
-        return sw.status === 'activated';
-      });
-
-      if (!activateCandidates.length || hasActiveServiceWorker) {
-        session.off('ServiceWorker.workerVersionUpdated', versionUpdatedListener);
-        session.sendCommand('ServiceWorker.disable').then(_ => resolve(data), reject);
-      }
-    };
-
-    session.on('ServiceWorker.workerVersionUpdated', versionUpdatedListener);
-
-    session.sendCommand('ServiceWorker.enable').catch(reject);
-  });
-}
-
-/**
- * @param {LH.Gatherer.ProtocolSession} session
- * @return {Promise<LH.Crdp.ServiceWorker.WorkerRegistrationUpdatedEvent>}
- */
-function getServiceWorkerRegistrations(session) {
-  return new Promise((resolve, reject) => {
-    session.once('ServiceWorker.workerRegistrationUpdated', data => {
-      session.sendCommand('ServiceWorker.disable').then(_ => resolve(data), reject);
-    });
-    session.sendCommand('ServiceWorker.enable').catch(reject);
-  });
-}
-
-export {getServiceWorkerVersions, getServiceWorkerRegistrations};

package/core/gather/gatherers/dobetterweb/tags-blocking-first-paint.d.ts

@@ -1,47 +0,0 @@
-export default TagsBlockingFirstPaint;
-export type MediaChange = {
-    href: string;
-    media: string;
-    msSinceHTMLEnd: number;
-    matches: boolean;
-};
-export type LinkTag = {
-    tagName: 'LINK';
-    url: string;
-    href: string;
-    rel: string;
-    media: string;
-    disabled: boolean;
-    mediaChanges: Array<MediaChange>;
-};
-export type ScriptTag = {
-    tagName: 'SCRIPT';
-    url: string;
-    src: string;
-};
-declare class TagsBlockingFirstPaint extends BaseGatherer {
-    /**
-     * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
-     * @return {Map<string, LH.Artifacts.NetworkRequest>}
-     */
-    static _filteredAndIndexedByUrl(networkRecords: Array<LH.Artifacts.NetworkRequest>): Map<string, LH.Artifacts.NetworkRequest>;
-    /**
-     * @param {LH.Gatherer.Driver} driver
-     * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
-     * @return {Promise<Array<LH.Artifacts.TagBlockingFirstPaint>>}
-     */
-    static findBlockingTags(driver: LH.Gatherer.Driver, networkRecords: Array<LH.Artifacts.NetworkRequest>): Promise<Array<LH.Artifacts.TagBlockingFirstPaint>>;
-    /** @type {LH.Gatherer.GathererMeta<'DevtoolsLog'>} */
-    meta: LH.Gatherer.GathererMeta<'DevtoolsLog'>;
-    /**
-     * @param {LH.Gatherer.Context} context
-     */
-    startSensitiveInstrumentation(context: LH.Gatherer.Context): Promise<void>;
-    /**
-     * @param {LH.Gatherer.Context<'DevtoolsLog'>} context
-     * @return {Promise<LH.Artifacts['TagsBlockingFirstPaint']>}
-     */
-    getArtifact(context: LH.Gatherer.Context<'DevtoolsLog'>): Promise<LH.Artifacts['TagsBlockingFirstPaint']>;
-}
-import BaseGatherer from '../../base-gatherer.js';
-//# sourceMappingURL=tags-blocking-first-paint.d.ts.map