core(lantern): move NetworkRequest to lib/dependency-graph

GoogleChrome · Feb 28, 2024 · 77b6952 · 77b6952
1 parent 9d9a5b3
commit 77b6952
Show file tree

Hide file tree

Showing 48 changed files with 90 additions and 73 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -76,7 +76,7 @@ module.exports = {
       vars: 'all',
       args: 'after-used',
       argsIgnorePattern: '(^reject$|^_+$)',
-      varsIgnorePattern: '(^_$|^LH$)',
+      varsIgnorePattern: '(^_$|^LH$|^Lantern$)',
     }],
     'no-cond-assign': 2,
     'space-infix-ops': 2,

diff --git a/core/audits/byte-efficiency/efficient-animated-content.js b/core/audits/byte-efficiency/efficient-animated-content.js
@@ -8,7 +8,7 @@
  */
 
 
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 

diff --git a/core/audits/byte-efficiency/offscreen-images.js b/core/audits/byte-efficiency/offscreen-images.js
@@ -10,7 +10,7 @@
 
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {Sentry} from '../../lib/sentry.js';
 import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';

diff --git a/core/audits/byte-efficiency/render-blocking-resources.js b/core/audits/byte-efficiency/render-blocking-resources.js
@@ -13,7 +13,7 @@ import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
 import {BaseNode} from '../../lib/dependency-graph/base-node.js';
 import {UnusedCSS} from '../../computed/unused-css.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {ProcessedNavigation} from '../../computed/processed-navigation.js';
 import {LoadSimulator} from '../../computed/load-simulator.js';
 import {FirstContentfulPaint} from '../../computed/metrics/first-contentful-paint.js';

diff --git a/core/audits/byte-efficiency/total-byte-weight.js b/core/audits/byte-efficiency/total-byte-weight.js
@@ -6,7 +6,7 @@
 
 import {Audit} from '../audit.js';
 import * as i18n from '../../lib/i18n/i18n.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {NetworkRecords} from '../../computed/network-records.js';
 import {Util} from '../../../shared/util.js';
 

diff --git a/core/audits/byte-efficiency/uses-long-cache-ttl.js b/core/audits/byte-efficiency/uses-long-cache-ttl.js
@@ -7,7 +7,7 @@
 import parseCacheControl from 'parse-cache-control';
 
 import {Audit} from '../audit.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import UrlUtils from '../../lib/url-utils.js';
 import {linearInterpolation} from '../../../shared/statistics.js';
 import * as i18n from '../../lib/i18n/i18n.js';

diff --git a/core/audits/byte-efficiency/uses-responsive-images.js b/core/audits/byte-efficiency/uses-responsive-images.js
@@ -14,7 +14,7 @@
 
 
 import {ByteEfficiencyAudit} from './byte-efficiency-audit.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {ImageRecords} from '../../computed/image-records.js';
 import UrlUtils from '../../lib/url-utils.js';
 import * as i18n from '../../lib/i18n/i18n.js';

diff --git a/core/audits/dobetterweb/uses-http2.js b/core/audits/dobetterweb/uses-http2.js
@@ -16,7 +16,7 @@ import {Audit} from '../audit.js';
 import {EntityClassification} from '../../computed/entity-classification.js';
 import UrlUtils from '../../lib/url-utils.js';
 import {LanternInteractive} from '../../computed/metrics/lantern-interactive.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {NetworkRecords} from '../../computed/network-records.js';
 import {LoadSimulator} from '../../computed/load-simulator.js';
 import {PageDependencyGraph} from '../../computed/page-dependency-graph.js';

diff --git a/core/audits/is-on-https.js b/core/audits/is-on-https.js
@@ -6,7 +6,7 @@
 
 import {Audit} from './audit.js';
 import UrlUtils from '../lib/url-utils.js';
-import {NetworkRequest} from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/dependency-graph/network-request.js';
 import {NetworkRecords} from '../computed/network-records.js';
 import * as i18n from '../lib/i18n/i18n.js';
 

diff --git a/core/audits/prioritize-lcp-image.js b/core/audits/prioritize-lcp-image.js
@@ -6,7 +6,7 @@
 
 import {Audit} from './audit.js';
 import * as i18n from '../lib/i18n/i18n.js';
-import {NetworkRequest} from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/dependency-graph/network-request.js';
 import {MainResource} from '../computed/main-resource.js';
 import {LanternLargestContentfulPaint} from '../computed/metrics/lantern-largest-contentful-paint.js';
 import {LoadSimulator} from '../computed/load-simulator.js';

diff --git a/core/audits/uses-rel-preload.js b/core/audits/uses-rel-preload.js
@@ -5,7 +5,7 @@
  */
 
 import UrlUtils from '../lib/url-utils.js';
-import {NetworkRequest} from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/dependency-graph/network-request.js';
 import {Audit} from './audit.js';
 import {CriticalRequestChains} from '../computed/critical-request-chains.js';
 import * as i18n from '../lib/i18n/i18n.js';

diff --git a/core/computed/critical-request-chains.js b/core/computed/critical-request-chains.js
@@ -5,7 +5,7 @@
  */
 
 import {makeComputedArtifact} from './computed-artifact.js';
-import {NetworkRequest} from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/dependency-graph/network-request.js';
 import {MainResource} from './main-resource.js';
 import {PageDependencyGraph} from './page-dependency-graph.js';
 

diff --git a/core/computed/metrics/lantern-interactive.js b/core/computed/metrics/lantern-interactive.js
@@ -7,7 +7,7 @@
 import {makeComputedArtifact} from '../computed-artifact.js';
 import {LanternMetric} from './lantern-metric.js';
 import {BaseNode} from '../../lib/dependency-graph/base-node.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {LanternFirstMeaningfulPaint} from './lantern-first-meaningful-paint.js';
 
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */

diff --git a/core/computed/metrics/lantern-metric.js b/core/computed/metrics/lantern-metric.js
@@ -5,7 +5,7 @@
  */
 
 import {BaseNode} from '../../lib/dependency-graph/base-node.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {ProcessedNavigation} from '../processed-navigation.js';
 import {PageDependencyGraph} from '../page-dependency-graph.js';
 import {LoadSimulator} from '../load-simulator.js';

diff --git a/core/computed/page-dependency-graph.js b/core/computed/page-dependency-graph.js
@@ -8,7 +8,7 @@ import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkNode} from '../lib/dependency-graph/network-node.js';
 import {CPUNode} from '../lib/dependency-graph/cpu-node.js';
 import {TraceProcessor} from '../lib/tracehouse/trace-processor.js';
-import {NetworkRequest} from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/dependency-graph/network-request.js';
 import {ProcessedTrace} from './processed-trace.js';
 import {NetworkRecords} from './network-records.js';
 import {NetworkAnalyzer} from '../lib/dependency-graph/simulator/network-analyzer.js';

diff --git a/core/computed/resource-summary.js b/core/computed/resource-summary.js
@@ -7,7 +7,7 @@
 import {EntityClassification} from './entity-classification.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
-import {NetworkRequest} from '../lib/network-request.js';
+import {NetworkRequest} from '../lib/dependency-graph/network-request.js';
 import {Budget} from '../config/budget.js';
 import UrlUtils from '../lib/url-utils.js';
 

diff --git a/core/gather/driver/network-monitor.js b/core/gather/driver/network-monitor.js
@@ -15,7 +15,7 @@ import log from 'lighthouse-logger';
 
 import * as LH from '../../../types/lh.js';
 import {NetworkRecorder} from '../../lib/network-recorder.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import UrlUtils from '../../lib/url-utils.js';
 
 /** @typedef {import('../../lib/network-recorder.js').NetworkRecorderEventMap} NetworkRecorderEventMap */

diff --git a/core/gather/driver/network.js b/core/gather/driver/network.js
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 
 /**
  * Return the body of the response with the given ID. Rejects if getting the

diff --git a/core/gather/gatherers/dobetterweb/optimized-images.js b/core/gather/gatherers/dobetterweb/optimized-images.js
@@ -14,7 +14,7 @@ import log from 'lighthouse-logger';
 
 import BaseGatherer from '../../base-gatherer.js';
 import UrlUtils from '../../../lib/url-utils.js';
-import {NetworkRequest} from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/dependency-graph/network-request.js';
 import {Sentry} from '../../../lib/sentry.js';
 import {NetworkRecords} from '../../../computed/network-records.js';
 import DevtoolsLog from '../devtools-log.js';

diff --git a/core/gather/gatherers/dobetterweb/response-compression.js b/core/gather/gatherers/dobetterweb/response-compression.js
@@ -17,7 +17,7 @@ import log from 'lighthouse-logger';
 
 import BaseGatherer from '../../base-gatherer.js';
 import UrlUtils from '../../../lib/url-utils.js';
-import {NetworkRequest} from '../../../lib/network-request.js';
+import {NetworkRequest} from '../../../lib/dependency-graph/network-request.js';
 import DevtoolsLog from '../devtools-log.js';
 import {fetchResponseBodyFromCache} from '../../driver/network.js';
 import {NetworkRecords} from '../../../computed/network-records.js';

diff --git a/core/gather/gatherers/script-elements.js b/core/gather/gatherers/script-elements.js
@@ -6,7 +6,7 @@
 
 import BaseGatherer from '../base-gatherer.js';
 import {NetworkRecords} from '../../computed/network-records.js';
-import {NetworkRequest} from '../../lib/network-request.js';
+import {NetworkRequest} from '../../lib/dependency-graph/network-request.js';
 import {pageFunctions} from '../../lib/page-functions.js';
 import DevtoolsLog from './devtools-log.js';
 

diff --git a/core/lib/dependency-graph/network-node.js b/core/lib/dependency-graph/network-node.js
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as LH from '../../../types/lh.js';
+import * as Lantern from './types.js';
 import {BaseNode} from './base-node.js';
-import {NetworkRequest} from '../network-request.js';
+import {NetworkRequest} from './network-request.js';
 
 class NetworkNode extends BaseNode {
   /**
-   * @param {LH.Artifacts.NetworkRequest} networkRecord
+   * @param {Lantern.NetworkRequest} networkRecord
    */
   constructor(networkRecord) {
     super(networkRecord.requestId);
@@ -37,7 +37,7 @@ class NetworkNode extends BaseNode {
   }
 
   /**
-   * @return {LH.Artifacts.NetworkRequest}
+   * @return {Lantern.NetworkRequest}
    */
   get record() {
     return this._record;

diff --git a/core/lib/network-request.js → core/lib/dependency-graph/network-request.js b/core/lib/network-request.js → core/lib/dependency-graph/network-request.js
@@ -52,8 +52,8 @@
       Trace: ResourceFinish.ts
  */
 
-import * as LH from '../../types/lh.js';
-import UrlUtils from './url-utils.js';
+import * as LH from '../../../types/lh.js';
+import UrlUtils from '../url-utils.js';
 
 // Lightrider X-Header names for timing information.
 // See: _updateTransferSizeForLightrider and _updateTimingsForLightrider.
@@ -569,7 +569,7 @@ class NetworkRequest {
   }
 
   /**
-   * @param {NetworkRequest} record
+   * @param {{protocol: string, parsedURL: ParsedURL}} record
    * @return {boolean}
    */
   static isNonNetworkRequest(record) {

diff --git a/core/lib/dependency-graph/simulator/connection-pool.js b/core/lib/dependency-graph/simulator/connection-pool.js
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as Lantern from '../types.js';
 import * as LH from '../../../../types/lh.js';
 import {NetworkAnalyzer} from './network-analyzer.js';
 import {TcpConnection} from './tcp-connection.js';
@@ -17,7 +18,7 @@ const CONNECTIONS_PER_ORIGIN = 6;
 
 export class ConnectionPool {
   /**
-   * @param {LH.Artifacts.NetworkRequest[]} records
+   * @param {Lantern.NetworkRequest[]} records
    * @param {Required<LH.Gatherer.Simulation.Options>} options
    */
   constructor(records, options) {
@@ -26,7 +27,7 @@ export class ConnectionPool {
     this._records = records;
     /** @type {Map<string, TcpConnection[]>} */
     this._connectionsByOrigin = new Map();
-    /** @type {Map<LH.Artifacts.NetworkRequest, TcpConnection>} */
+    /** @type {Map<Lantern.NetworkRequest, TcpConnection>} */
     this._connectionsByRecord = new Map();
     this._connectionsInUse = new Set();
     this._connectionReusedByRequestId = NetworkAnalyzer.estimateIfConnectionWasReused(records, {
@@ -124,7 +125,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 {LH.Artifacts.NetworkRequest} record
+   * @param {Lantern.NetworkRequest} record
    * @param {{ignoreConnectionReused?: boolean}} options
    * @return {?TcpConnection}
    */
@@ -150,7 +151,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 {LH.Artifacts.NetworkRequest} record
+   * @param {Lantern.NetworkRequest} record
    * @return {TcpConnection}
    */
   acquireActiveConnectionFromRecord(record) {
@@ -161,7 +162,7 @@ export class ConnectionPool {
   }
 
   /**
-   * @param {LH.Artifacts.NetworkRequest} record
+   * @param {Lantern.NetworkRequest} record
    */
   release(record) {
     const connection = this._connectionsByRecord.get(record);

diff --git a/core/lib/dependency-graph/simulator/dns-cache.js b/core/lib/dependency-graph/simulator/dns-cache.js
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as LH from '../../../../types/lh.js';
+import * as Lantern from '../types.js';
 
 // A DNS lookup will usually take ~1-2 roundtrips of connection latency plus the extra DNS routing time.
 // Example: https://www.webpagetest.org/result/180703_3A_e33ec79747c002ed4d7bcbfc81462203/1/details/#waterfall_view_step1
@@ -25,7 +25,7 @@ class DNSCache {
   }
 
   /**
-   * @param {LH.Artifacts.NetworkRequest} request
+   * @param {Lantern.NetworkRequest} request
    * @param {{requestedAt: number, shouldUpdateCache: boolean}=} options
    * @return {number}
    */
@@ -47,7 +47,7 @@ class DNSCache {
   }
 
   /**
-   * @param {LH.Artifacts.NetworkRequest} request
+   * @param {Lantern.NetworkRequest} request
    * @param {number} resolvedAt
    */
   _updateCacheResolvedAtIfNeeded(request, resolvedAt) {