lighthouse 11.6.0-dev.20240304 → 11.6.0-dev.20240305

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

@@ -4,7 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Lantern from './lantern.js';
+/** @template T @typedef {import('../../../types/internal/lantern.js').Lantern.NetworkRequest<T>} NetworkRequest */
+
+import {NetworkRequestTypes} from './lantern.js';
 import {BaseNode} from './base-node.js';
 // TODO(15841): bring impl of isNonNetworkRequest inside lantern and remove this.
 import UrlUtils from '../url-utils.js';
@@ -15,7 +17,7 @@ import UrlUtils from '../url-utils.js';
  */
 class NetworkNode extends BaseNode {
   /**
-   * @param {Lantern.NetworkRequest<T>} networkRequest
+   * @param {NetworkRequest<T>} networkRequest
    */
   constructor(networkRequest) {
     super(networkRequest.requestId);
@@ -49,7 +51,7 @@ class NetworkNode extends BaseNode {
   }
 
   /**
-   * @return {Lantern.NetworkRequest<T>}
+   * @return {NetworkRequest<T>}
    */
   get request() {
     return this._request;
@@ -93,8 +95,8 @@ class NetworkNode extends BaseNode {
    */
   hasRenderBlockingPriority() {
     const priority = this._request.priority;
-    const isScript = this._request.resourceType === Lantern.NetworkRequestTypes.Script;
-    const isDocument = this._request.resourceType === Lantern.NetworkRequestTypes.Document;
+    const isScript = this._request.resourceType === NetworkRequestTypes.Script;
+    const isDocument = this._request.resourceType === NetworkRequestTypes.Document;
     const isBlockingScript = priority === 'High' && isScript;
     const isBlockingHtmlImport = priority === 'High' && isDocument;
     return priority === 'VeryHigh' || isBlockingScript || isBlockingHtmlImport;

package/core/lib/lantern/page-dependency-graph.d.ts

@@ -0,0 +1,58 @@
+export type NetworkRequest = import('../../../types/internal/lantern.js').Lantern.NetworkRequest;
+export type Node = import('./base-node.js').Node;
+export type URLArtifact = Omit<LH.Artifacts['URL'], 'finalDisplayedUrl'>;
+export type NetworkNodeOutput = {
+    nodes: Array<NetworkNode>;
+    idToNodeMap: Map<string, NetworkNode>;
+    urlToNodeMap: Map<string, Array<NetworkNode>>;
+    frameIdToNodeMap: Map<string, NetworkNode | null>;
+};
+export class PageDependencyGraph {
+    /**
+     * @param {NetworkRequest} record
+     * @return {Array<string>}
+     */
+    static getNetworkInitiators(record: NetworkRequest): Array<string>;
+    /**
+     * @param {Array<NetworkRequest>} networkRecords
+     * @return {NetworkNodeOutput}
+     */
+    static getNetworkNodeOutput(networkRecords: Array<NetworkRequest>): NetworkNodeOutput;
+    /**
+     * @param {LH.Artifacts.ProcessedTrace} processedTrace
+     * @return {Array<CPUNode>}
+     */
+    static getCPUNodes({ mainThreadEvents }: LH.Artifacts.ProcessedTrace): Array<CPUNode>;
+    /**
+     * @param {NetworkNode} rootNode
+     * @param {NetworkNodeOutput} networkNodeOutput
+     */
+    static linkNetworkNodes(rootNode: NetworkNode, networkNodeOutput: NetworkNodeOutput): void;
+    /**
+     * @param {Node} rootNode
+     * @param {NetworkNodeOutput} networkNodeOutput
+     * @param {Array<CPUNode>} cpuNodes
+     */
+    static linkCPUNodes(rootNode: Node, networkNodeOutput: NetworkNodeOutput, cpuNodes: Array<CPUNode>): void;
+    /**
+     * Removes the given node from the graph, but retains all paths between its dependencies and
+     * dependents.
+     * @param {Node} node
+     */
+    static _pruneNode(node: Node): void;
+    /**
+     * @param {LH.Artifacts.ProcessedTrace} processedTrace
+     * @param {Array<NetworkRequest>} networkRecords
+     * @param {URLArtifact} URL
+     * @return {Node}
+     */
+    static createGraph(processedTrace: LH.Artifacts.ProcessedTrace, networkRecords: Array<NetworkRequest>, URL: URLArtifact): Node;
+    /**
+     *
+     * @param {Node} rootNode
+     */
+    static printGraph(rootNode: Node, widthInCharacters?: number): void;
+}
+import { NetworkNode } from './network-node.js';
+import { CPUNode } from './cpu-node.js';
+//# sourceMappingURL=page-dependency-graph.d.ts.map

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

@@ -0,0 +1,463 @@
+/**
+ * @license
+ * Copyright 2024 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {NetworkRequestTypes} from './lantern.js';
+import {NetworkNode} from './network-node.js';
+import {CPUNode} from './cpu-node.js';
+import {TraceProcessor} from '../tracehouse/trace-processor.js';
+import {NetworkAnalyzer} from './simulator/network-analyzer.js';
+
+/** @typedef {import('../../../types/internal/lantern.js').Lantern.NetworkRequest} NetworkRequest */
+/** @typedef {import('./base-node.js').Node} Node */
+/** @typedef {Omit<LH.Artifacts['URL'], 'finalDisplayedUrl'>} URLArtifact */
+
+/**
+ * @typedef {Object} NetworkNodeOutput
+ * @property {Array<NetworkNode>} nodes
+ * @property {Map<string, NetworkNode>} idToNodeMap
+ * @property {Map<string, Array<NetworkNode>>} urlToNodeMap
+ * @property {Map<string, NetworkNode|null>} frameIdToNodeMap
+ */
+
+// Shorter tasks have negligible impact on simulation results.
+const SIGNIFICANT_DUR_THRESHOLD_MS = 10;
+
+// TODO: video files tend to be enormous and throw off all graph traversals, move this ignore
+//    into estimation logic when we use the dependency graph for other purposes.
+const IGNORED_MIME_TYPES_REGEX = /^video/;
+
+class PageDependencyGraph {
+  /**
+   * @param {NetworkRequest} record
+   * @return {Array<string>}
+   */
+  static getNetworkInitiators(record) {
+    if (!record.initiator) return [];
+    if (record.initiator.url) return [record.initiator.url];
+    if (record.initiator.type === 'script') {
+      // Script initiators have the stack of callFrames from all functions that led to this request.
+      // If async stacks are enabled, then the stack will also have the parent functions that asynchronously
+      // led to this request chained in the `parent` property.
+      /** @type {Set<string>} */
+      const scriptURLs = new Set();
+      let stack = record.initiator.stack;
+      while (stack) {
+        const callFrames = stack.callFrames || [];
+        for (const frame of callFrames) {
+          if (frame.url) scriptURLs.add(frame.url);
+        }
+
+        stack = stack.parent;
+      }
+
+      return Array.from(scriptURLs);
+    }
+
+    return [];
+  }
+
+  /**
+   * @param {Array<NetworkRequest>} networkRecords
+   * @return {NetworkNodeOutput}
+   */
+  static getNetworkNodeOutput(networkRecords) {
+    /** @type {Array<NetworkNode>} */
+    const nodes = [];
+    /** @type {Map<string, NetworkNode>} */
+    const idToNodeMap = new Map();
+    /** @type {Map<string, Array<NetworkNode>>} */
+    const urlToNodeMap = new Map();
+    /** @type {Map<string, NetworkNode|null>} */
+    const frameIdToNodeMap = new Map();
+
+    networkRecords.forEach(record => {
+      if (IGNORED_MIME_TYPES_REGEX.test(record.mimeType)) return;
+      if (record.sessionTargetType === 'worker') return;
+
+      // Network record requestIds can be duplicated for an unknown reason
+      // Suffix all subsequent records with `:duplicate` until it's unique
+      // NOTE: This should never happen with modern NetworkRequest library, but old fixtures
+      // might still have this issue.
+      while (idToNodeMap.has(record.requestId)) {
+        record.requestId += ':duplicate';
+      }
+
+      const node = new NetworkNode(record);
+      nodes.push(node);
+
+      const urlList = urlToNodeMap.get(record.url) || [];
+      urlList.push(node);
+
+      idToNodeMap.set(record.requestId, node);
+      urlToNodeMap.set(record.url, urlList);
+
+      // If the request was for the root document of an iframe, save an entry in our
+      // map so we can link up the task `args.data.frame` dependencies later in graph creation.
+      if (record.frameId &&
+          record.resourceType === NetworkRequestTypes.Document &&
+          record.documentURL === record.url) {
+        // If there's ever any ambiguity, permanently set the value to `false` to avoid loops in the graph.
+        const value = frameIdToNodeMap.has(record.frameId) ? null : node;
+        frameIdToNodeMap.set(record.frameId, value);
+      }
+    });
+
+    return {nodes, idToNodeMap, urlToNodeMap, frameIdToNodeMap};
+  }
+
+  /**
+   * @param {LH.Artifacts.ProcessedTrace} processedTrace
+   * @return {Array<CPUNode>}
+   */
+  static getCPUNodes({mainThreadEvents}) {
+    /** @type {Array<CPUNode>} */
+    const nodes = [];
+    let i = 0;
+
+    TraceProcessor.assertHasToplevelEvents(mainThreadEvents);
+
+    while (i < mainThreadEvents.length) {
+      const evt = mainThreadEvents[i];
+      i++;
+
+      // Skip all trace events that aren't schedulable tasks with sizable duration
+      if (!TraceProcessor.isScheduleableTask(evt) || !evt.dur) {
+        continue;
+      }
+
+      // Capture all events that occurred within the task
+      /** @type {Array<LH.TraceEvent>} */
+      const children = [];
+      for (
+        const endTime = evt.ts + evt.dur;
+        i < mainThreadEvents.length && mainThreadEvents[i].ts < endTime;
+        i++
+      ) {
+        children.push(mainThreadEvents[i]);
+      }
+
+      nodes.push(new CPUNode(evt, children));
+    }
+
+    return nodes;
+  }
+
+  /**
+   * @param {NetworkNode} rootNode
+   * @param {NetworkNodeOutput} networkNodeOutput
+   */
+  static linkNetworkNodes(rootNode, networkNodeOutput) {
+    networkNodeOutput.nodes.forEach(node => {
+      const directInitiatorRequest = node.request.initiatorRequest || rootNode.request;
+      const directInitiatorNode =
+        networkNodeOutput.idToNodeMap.get(directInitiatorRequest.requestId) || rootNode;
+      const canDependOnInitiator =
+        !directInitiatorNode.isDependentOn(node) &&
+        node.canDependOn(directInitiatorNode);
+      const initiators = PageDependencyGraph.getNetworkInitiators(node.request);
+      if (initiators.length) {
+        initiators.forEach(initiator => {
+          const parentCandidates = networkNodeOutput.urlToNodeMap.get(initiator) || [];
+          // Only add the edge if the parent is unambiguous with valid timing and isn't circular.
+          if (parentCandidates.length === 1 &&
+              parentCandidates[0].startTime <= node.startTime &&
+              !parentCandidates[0].isDependentOn(node)) {
+            node.addDependency(parentCandidates[0]);
+          } else if (canDependOnInitiator) {
+            directInitiatorNode.addDependent(node);
+          }
+        });
+      } else if (canDependOnInitiator) {
+        directInitiatorNode.addDependent(node);
+      }
+
+      // Make sure the nodes are attached to the graph if the initiator information was invalid.
+      if (node !== rootNode && node.getDependencies().length === 0 && node.canDependOn(rootNode)) {
+        node.addDependency(rootNode);
+      }
+
+      if (!node.request.redirects) return;
+
+      const redirects = [...node.request.redirects, node.request];
+      for (let i = 1; i < redirects.length; i++) {
+        const redirectNode = networkNodeOutput.idToNodeMap.get(redirects[i - 1].requestId);
+        const actualNode = networkNodeOutput.idToNodeMap.get(redirects[i].requestId);
+        if (actualNode && redirectNode) {
+          actualNode.addDependency(redirectNode);
+        }
+      }
+    });
+  }
+
+  /**
+   * @param {Node} rootNode
+   * @param {NetworkNodeOutput} networkNodeOutput
+   * @param {Array<CPUNode>} cpuNodes
+   */
+  static linkCPUNodes(rootNode, networkNodeOutput, cpuNodes) {
+    /** @type {Set<LH.Crdp.Network.ResourceType|undefined>} */
+    const linkableResourceTypes = new Set([
+      NetworkRequestTypes.XHR, NetworkRequestTypes.Fetch, NetworkRequestTypes.Script,
+    ]);
+
+    /** @param {CPUNode} cpuNode @param {string} reqId */
+    function addDependentNetworkRequest(cpuNode, reqId) {
+      const networkNode = networkNodeOutput.idToNodeMap.get(reqId);
+      if (!networkNode ||
+          // Ignore all network nodes that started before this CPU task started
+          // A network request that started earlier could not possibly have been started by this task
+          networkNode.startTime <= cpuNode.startTime) return;
+      const {request} = networkNode;
+      const resourceType = request.resourceType ||
+        request.redirectDestination?.resourceType;
+      if (!linkableResourceTypes.has(resourceType)) {
+        // We only link some resources to CPU nodes because we observe LCP simulation
+        // regressions when including images, etc.
+        return;
+      }
+      cpuNode.addDependent(networkNode);
+    }
+
+    /**
+     * If the node has an associated frameId, then create a dependency on the root document request
+     * for the frame. The task obviously couldn't have started before the frame was even downloaded.
+     *
+     * @param {CPUNode} cpuNode
+     * @param {string|undefined} frameId
+     */
+    function addDependencyOnFrame(cpuNode, frameId) {
+      if (!frameId) return;
+      const networkNode = networkNodeOutput.frameIdToNodeMap.get(frameId);
+      if (!networkNode) return;
+      // Ignore all network nodes that started after this CPU task started
+      // A network request that started after could not possibly be required this task
+      if (networkNode.startTime >= cpuNode.startTime) return;
+      cpuNode.addDependency(networkNode);
+    }
+
+    /** @param {CPUNode} cpuNode @param {string} url */
+    function addDependencyOnUrl(cpuNode, url) {
+      if (!url) return;
+      // Allow network requests that end up to 100ms before the task started
+      // Some script evaluations can start before the script finishes downloading
+      const minimumAllowableTimeSinceNetworkNodeEnd = -100 * 1000;
+      const candidates = networkNodeOutput.urlToNodeMap.get(url) || [];
+
+      let minCandidate = null;
+      let minDistance = Infinity;
+      // Find the closest request that finished before this CPU task started
+      for (const candidate of candidates) {
+        // Explicitly ignore all requests that started after this CPU node
+        // A network request that started after this task started cannot possibly be a dependency
+        if (cpuNode.startTime <= candidate.startTime) return;
+
+        const distance = cpuNode.startTime - candidate.endTime;
+        if (distance >= minimumAllowableTimeSinceNetworkNodeEnd && distance < minDistance) {
+          minCandidate = candidate;
+          minDistance = distance;
+        }
+      }
+
+      if (!minCandidate) return;
+      cpuNode.addDependency(minCandidate);
+    }
+
+    /** @type {Map<string, CPUNode>} */
+    const timers = new Map();
+    for (const node of cpuNodes) {
+      for (const evt of node.childEvents) {
+        if (!evt.args.data) continue;
+
+        const argsUrl = evt.args.data.url;
+        const stackTraceUrls = (evt.args.data.stackTrace || []).map(l => l.url).filter(Boolean);
+
+        switch (evt.name) {
+          case 'TimerInstall':
+            // @ts-expect-error - 'TimerInstall' event means timerId exists.
+            timers.set(evt.args.data.timerId, node);
+            stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
+            break;
+          case 'TimerFire': {
+            // @ts-expect-error - 'TimerFire' event means timerId exists.
+            const installer = timers.get(evt.args.data.timerId);
+            if (!installer || installer.endTime > node.startTime) break;
+            installer.addDependent(node);
+            break;
+          }
+
+          case 'InvalidateLayout':
+          case 'ScheduleStyleRecalculation':
+            addDependencyOnFrame(node, evt.args.data.frame);
+            stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
+            break;
+
+          case 'EvaluateScript':
+            addDependencyOnFrame(node, evt.args.data.frame);
+            // @ts-expect-error - 'EvaluateScript' event means argsUrl is defined.
+            addDependencyOnUrl(node, argsUrl);
+            stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
+            break;
+
+          case 'XHRReadyStateChange':
+            // Only create the dependency if the request was completed
+            // 'XHRReadyStateChange' event means readyState is defined.
+            if (evt.args.data.readyState !== 4) break;
+
+            // @ts-expect-error - 'XHRReadyStateChange' event means argsUrl is defined.
+            addDependencyOnUrl(node, argsUrl);
+            stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
+            break;
+
+          case 'FunctionCall':
+          case 'v8.compile':
+            addDependencyOnFrame(node, evt.args.data.frame);
+            // @ts-expect-error - events mean argsUrl is defined.
+            addDependencyOnUrl(node, argsUrl);
+            break;
+
+          case 'ParseAuthorStyleSheet':
+            addDependencyOnFrame(node, evt.args.data.frame);
+            // @ts-expect-error - 'ParseAuthorStyleSheet' event means styleSheetUrl is defined.
+            addDependencyOnUrl(node, evt.args.data.styleSheetUrl);
+            break;
+
+          case 'ResourceSendRequest':
+            addDependencyOnFrame(node, evt.args.data.frame);
+            // @ts-expect-error - 'ResourceSendRequest' event means requestId is defined.
+            addDependentNetworkRequest(node, evt.args.data.requestId);
+            stackTraceUrls.forEach(url => addDependencyOnUrl(node, url));
+            break;
+        }
+      }
+
+      // Nodes starting before the root node cannot depend on it.
+      if (node.getNumberOfDependencies() === 0 && node.canDependOn(rootNode)) {
+        node.addDependency(rootNode);
+      }
+    }
+
+    // Second pass to prune the graph of short tasks.
+    const minimumEvtDur = SIGNIFICANT_DUR_THRESHOLD_MS * 1000;
+    let foundFirstLayout = false;
+    let foundFirstPaint = false;
+    let foundFirstParse = false;
+
+    for (const node of cpuNodes) {
+      // Don't prune if event is the first ParseHTML/Layout/Paint.
+      // See https://github.com/GoogleChrome/lighthouse/issues/9627#issuecomment-526699524 for more.
+      let isFirst = false;
+      if (!foundFirstLayout && node.childEvents.some(evt => evt.name === 'Layout')) {
+        isFirst = foundFirstLayout = true;
+      }
+      if (!foundFirstPaint && node.childEvents.some(evt => evt.name === 'Paint')) {
+        isFirst = foundFirstPaint = true;
+      }
+      if (!foundFirstParse && node.childEvents.some(evt => evt.name === 'ParseHTML')) {
+        isFirst = foundFirstParse = true;
+      }
+
+      if (isFirst || node.event.dur >= minimumEvtDur) {
+        // Don't prune this node. The task is long / important so it will impact simulation.
+        continue;
+      }
+
+      // Prune the node if it isn't highly connected to minimize graph size. Rewiring the graph
+      // here replaces O(M + N) edges with (M * N) edges, which is fine if either  M or N is at
+      // most 1.
+      if (node.getNumberOfDependencies() === 1 || node.getNumberOfDependents() <= 1) {
+        PageDependencyGraph._pruneNode(node);
+      }
+    }
+  }
+
+  /**
+   * Removes the given node from the graph, but retains all paths between its dependencies and
+   * dependents.
+   * @param {Node} node
+   */
+  static _pruneNode(node) {
+    const dependencies = node.getDependencies();
+    const dependents = node.getDependents();
+    for (const dependency of dependencies) {
+      node.removeDependency(dependency);
+      for (const dependent of dependents) {
+        dependency.addDependent(dependent);
+      }
+    }
+    for (const dependent of dependents) {
+      node.removeDependent(dependent);
+    }
+  }
+
+  /**
+   * @param {LH.Artifacts.ProcessedTrace} processedTrace
+   * @param {Array<NetworkRequest>} networkRecords
+   * @param {URLArtifact} URL
+   * @return {Node}
+   */
+  static createGraph(processedTrace, networkRecords, URL) {
+    const networkNodeOutput = PageDependencyGraph.getNetworkNodeOutput(networkRecords);
+    const cpuNodes = PageDependencyGraph.getCPUNodes(processedTrace);
+    const {requestedUrl, mainDocumentUrl} = URL;
+    if (!requestedUrl) throw new Error('requestedUrl is required to get the root request');
+    if (!mainDocumentUrl) throw new Error('mainDocumentUrl is required to get the main resource');
+
+    const rootRequest = NetworkAnalyzer.findResourceForUrl(networkRecords, requestedUrl);
+    if (!rootRequest) throw new Error('rootRequest not found');
+    const rootNode = networkNodeOutput.idToNodeMap.get(rootRequest.requestId);
+    if (!rootNode) throw new Error('rootNode not found');
+
+    const mainDocumentRequest =
+      NetworkAnalyzer.findLastDocumentForUrl(networkRecords, mainDocumentUrl);
+    if (!mainDocumentRequest) throw new Error('mainDocumentRequest not found');
+    const mainDocumentNode = networkNodeOutput.idToNodeMap.get(mainDocumentRequest.requestId);
+    if (!mainDocumentNode) throw new Error('mainDocumentNode not found');
+
+    PageDependencyGraph.linkNetworkNodes(rootNode, networkNodeOutput);
+    PageDependencyGraph.linkCPUNodes(rootNode, networkNodeOutput, cpuNodes);
+    mainDocumentNode.setIsMainDocument(true);
+
+    if (NetworkNode.hasCycle(rootNode)) {
+      throw new Error('Invalid dependency graph created, cycle detected');
+    }
+
+    return rootNode;
+  }
+
+  /**
+   *
+   * @param {Node} rootNode
+   */
+  static printGraph(rootNode, widthInCharacters = 100) {
+    /** @param {string} str @param {number} target */
+    function padRight(str, target, padChar = ' ') {
+      return str + padChar.repeat(Math.max(target - str.length, 0));
+    }
+
+    /** @type {Array<Node>} */
+    const nodes = [];
+    rootNode.traverse(node => nodes.push(node));
+    nodes.sort((a, b) => a.startTime - b.startTime);
+
+    const min = nodes[0].startTime;
+    const max = nodes.reduce((max, node) => Math.max(max, node.endTime), 0);
+
+    const totalTime = max - min;
+    const timePerCharacter = totalTime / widthInCharacters;
+    nodes.forEach(node => {
+      const offset = Math.round((node.startTime - min) / timePerCharacter);
+      const length = Math.ceil((node.endTime - node.startTime) / timePerCharacter);
+      const bar = padRight('', offset) + padRight('', length, '=');
+
+      // @ts-expect-error -- disambiguate displayName from across possible Node types.
+      const displayName = node.request ? node.request.url : node.type;
+      // eslint-disable-next-line
+      console.log(padRight(bar, widthInCharacters), `| ${displayName.slice(0, 30)}`);
+    });
+  }
+}
+
+export {PageDependencyGraph};

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

@@ -1,15 +1,15 @@
 export class ConnectionPool {
     /**
-     * @param {Lantern.NetworkRequest[]} records
-     * @param {Required<LH.Gatherer.Simulation.Options>} options
+     * @param {NetworkRequest[]} records
+     * @param {Required<SimulationOptions>} options
      */
-    constructor(records: import("../../../../types/internal/lantern.js").NetworkRequest<any>[], options: Required<LH.Gatherer.Simulation.Options>);
-    _options: Required<LH.Gatherer.Simulation.Options>;
-    _records: import("../../../../types/internal/lantern.js").NetworkRequest<any>[];
+    constructor(records: NetworkRequest[], options: Required<SimulationOptions>);
+    _options: Required<import("../../../../types/internal/lantern.js").Lantern.Simulation.Options>;
+    _records: import("../../../../types/internal/lantern.js").Lantern.NetworkRequest<any>[];
     /** @type {Map<string, TcpConnection[]>} */
     _connectionsByOrigin: Map<string, TcpConnection[]>;
-    /** @type {Map<Lantern.NetworkRequest, TcpConnection>} */
-    _connectionsByRecord: Map<import("../../../../types/internal/lantern.js").NetworkRequest<any>, TcpConnection>;
+    /** @type {Map<NetworkRequest, TcpConnection>} */
+    _connectionsByRecord: Map<NetworkRequest, TcpConnection>;
     _connectionsInUse: Set<any>;
     _connectionReusedByRequestId: Map<string, boolean>;
     /**
@@ -33,26 +33,27 @@ export class ConnectionPool {
      * 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 {NetworkRequest} record
      * @param {{ignoreConnectionReused?: boolean}} options
      * @return {?TcpConnection}
      */
-    acquire(record: import("../../../../types/internal/lantern.js").NetworkRequest<any>, options?: {
+    acquire(record: NetworkRequest, options?: {
         ignoreConnectionReused?: boolean;
     }): 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.
      *
-     * @param {Lantern.NetworkRequest} record
+     * @param {NetworkRequest} record
      * @return {TcpConnection}
      */
-    acquireActiveConnectionFromRecord(record: import("../../../../types/internal/lantern.js").NetworkRequest<any>): TcpConnection;
+    acquireActiveConnectionFromRecord(record: NetworkRequest): TcpConnection;
     /**
-     * @param {Lantern.NetworkRequest} record
+     * @param {NetworkRequest} record
      */
-    release(record: import("../../../../types/internal/lantern.js").NetworkRequest<any>): void;
+    release(record: NetworkRequest): void;
 }
-import * as LH from '../../../../types/lh.js';
+export type NetworkRequest = import('../../../../types/internal/lantern.js').Lantern.NetworkRequest;
+export type SimulationOptions = import('../../../../types/internal/lantern.js').Lantern.Simulation.Options;
 import { TcpConnection } from './tcp-connection.js';
 //# sourceMappingURL=connection-pool.d.ts.map

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

@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as LH from '../../../../types/lh.js';
-import * as Lantern from '../lantern.js';
+/** @typedef {import('../../../../types/internal/lantern.js').Lantern.NetworkRequest} NetworkRequest */
+/** @typedef {import('../../../../types/internal/lantern.js').Lantern.Simulation.Options} SimulationOptions */
+
 import {NetworkAnalyzer} from './network-analyzer.js';
 import {TcpConnection} from './tcp-connection.js';
 
@@ -18,8 +19,8 @@ const CONNECTIONS_PER_ORIGIN = 6;
 
 export class ConnectionPool {
   /**
-   * @param {Lantern.NetworkRequest[]} records
-   * @param {Required<LH.Gatherer.Simulation.Options>} options
+   * @param {NetworkRequest[]} records
+   * @param {Required<SimulationOptions>} options
    */
   constructor(records, options) {
     this._options = options;
@@ -27,7 +28,7 @@ export class ConnectionPool {
     this._records = records;
     /** @type {Map<string, TcpConnection[]>} */
     this._connectionsByOrigin = new Map();
-    /** @type {Map<Lantern.NetworkRequest, TcpConnection>} */
+    /** @type {Map<NetworkRequest, TcpConnection>} */
     this._connectionsByRecord = new Map();
     this._connectionsInUse = new Set();
     this._connectionReusedByRequestId = NetworkAnalyzer.estimateIfConnectionWasReused(records, {
@@ -125,7 +126,7 @@ export class ConnectionPool {
    * 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 {NetworkRequest} record
    * @param {{ignoreConnectionReused?: boolean}} options
    * @return {?TcpConnection}
    */
@@ -151,7 +152,7 @@ export class ConnectionPool {
    * Return the connection currently being used to fetch a record. If no connection
    * currently being used for this record, an error will be thrown.
    *
-   * @param {Lantern.NetworkRequest} record
+   * @param {NetworkRequest} record
    * @return {TcpConnection}
    */
   acquireActiveConnectionFromRecord(record) {
@@ -162,7 +163,7 @@ export class ConnectionPool {
   }
 
   /**
-   * @param {Lantern.NetworkRequest} record
+   * @param {NetworkRequest} record
    */
   release(record) {
     const connection = this._connectionsByRecord.get(record);