core: remove WebInspector.resourceTypes references

lighthouse-core/audits/byte-efficiency/byte-efficiency-audit.js

@@ -69,7 +69,7 @@ class UnusedBytes extends Audit {
    *
    * @param {LH.WebInspector.NetworkRequest=} networkRecord
    * @param {number} totalBytes Uncompressed size of the resource
-   * @param {string=} resourceType
+   * @param {LH.Crdp.Page.ResourceType=} resourceType
    * @param {number=} compressionRatio
    * @return {number}
    */
@@ -79,7 +79,7 @@ class UnusedBytes extends Audit {
       // roughly the size of the content gzipped.
       // See https://discuss.httparchive.org/t/file-size-and-compression-savings/145 for multipliers
       return Math.round(totalBytes * compressionRatio);
-    } else if (networkRecord._resourceType && networkRecord._resourceType._name === resourceType) {
+    } else if (networkRecord._resourceType === resourceType) {
       // This was a regular standalone asset, just use the transfer size.
       return networkRecord.transferSize || 0;
     } else {

lighthouse-core/audits/byte-efficiency/efficient-animated-content.js

@@ -8,7 +8,7 @@
  */
 'use strict';
 
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 const ByteEfficiencyAudit = require('./byte-efficiency-audit');
 
 // If GIFs are above this size, we'll flag them
@@ -49,7 +49,7 @@ class EfficientAnimatedContent extends ByteEfficiencyAudit {
   static audit_(artifacts, networkRecords) {
     const unoptimizedContent = networkRecords.filter(
       record => record._mimeType === 'image/gif' &&
-        record._resourceType === WebInspector.resourceTypes.Image &&
+        record._resourceType === NetworkRequest.TYPES.Image &&
         (record._resourceSize || 0) > GIF_BYTE_THRESHOLD
     );
 

lighthouse-core/audits/byte-efficiency/render-blocking-resources.js

@@ -13,7 +13,7 @@ const Audit = require('../audit');
 const BaseNode = require('../../lib/dependency-graph/base-node');
 const ByteEfficiencyAudit = require('./byte-efficiency-audit');
 const UnusedCSS = require('./unused-css-rules');
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 
 /** @typedef {import('../../lib/dependency-graph/simulator/simulator')} Simulator */
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
@@ -152,7 +152,7 @@ class RenderBlockingResources extends Audit {
       if (node.type !== BaseNode.TYPES.NETWORK) return !canDeferRequest;
 
       const isStylesheet =
-        node.record._resourceType === WebInspector.resourceTypes.Stylesheet;
+        node.record._resourceType === NetworkRequest.TYPES.Stylesheet;
       if (canDeferRequest && isStylesheet) {
         // We'll inline the used bytes of the stylesheet and assume the rest can be deferred
         const wastedBytes = wastedCssBytesByUrl.get(node.record.url) || 0;

lighthouse-core/audits/byte-efficiency/unminified-css.js

@@ -107,7 +107,7 @@ class UnminifiedCSS extends ByteEfficiencyAudit {
     }
 
     const totalBytes = ByteEfficiencyAudit.estimateTransferSize(networkRecord, content.length,
-      'stylesheet');
+      'Stylesheet');
     const wastedRatio = 1 - totalTokenLength / content.length;
     const wastedBytes = Math.round(totalBytes * wastedRatio);
 

lighthouse-core/audits/byte-efficiency/unminified-javascript.js

@@ -57,7 +57,7 @@ class UnminifiedJavaScript extends ByteEfficiencyAudit {
     }
 
     const totalBytes = ByteEfficiencyAudit.estimateTransferSize(networkRecord, contentLength,
-      'script');
+      'Script');
     const wastedRatio = 1 - totalTokenLength / contentLength;
     const wastedBytes = Math.round(totalBytes * wastedRatio);
 

lighthouse-core/audits/byte-efficiency/unused-css-rules.js

@@ -81,7 +81,7 @@ class UnusedCSSRules extends ByteEfficiencyAudit {
     }
 
     const totalTransferredBytes = ByteEfficiencyAudit.estimateTransferSize(
-        stylesheetInfo.networkRecord, totalUncompressedBytes, 'stylesheet');
+        stylesheetInfo.networkRecord, totalUncompressedBytes, 'Stylesheet');
     const percentUnused = (totalUncompressedBytes - usedUncompressedBytes) / totalUncompressedBytes;
     const wastedBytes = Math.round(percentUnused * totalTransferredBytes);
 

lighthouse-core/audits/byte-efficiency/unused-javascript.js

@@ -73,7 +73,7 @@ class UnusedJavaScript extends ByteEfficiencyAudit {
     }
 
     const totalBytes = ByteEfficiencyAudit.estimateTransferSize(networkRecord, contentLength,
-        'script');
+        'Script');
     const wastedRatio = (unusedLength / contentLength) || 0;
     const wastedBytes = Math.round(totalBytes * wastedRatio);
 

lighthouse-core/audits/byte-efficiency/uses-long-cache-ttl.js

@@ -9,7 +9,7 @@ const assert = require('assert');
 // @ts-ignore - typed where used.
 const parseCacheControl = require('parse-cache-control');
 const Audit = require('../audit');
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 const URL = require('../../lib/url-shim');
 const linearInterpolation = require('../../lib/statistics').linearInterpolation;
 
@@ -135,17 +135,17 @@ class CacheHeaders extends Audit {
     const CACHEABLE_STATUS_CODES = new Set([200, 203, 206]);
 
     const STATIC_RESOURCE_TYPES = new Set([
-      WebInspector.resourceTypes.Font,
-      WebInspector.resourceTypes.Image,
-      WebInspector.resourceTypes.Media,
-      WebInspector.resourceTypes.Script,
-      WebInspector.resourceTypes.Stylesheet,
+      NetworkRequest.TYPES.Font,
+      NetworkRequest.TYPES.Image,
+      NetworkRequest.TYPES.Media,
+      NetworkRequest.TYPES.Script,
+      NetworkRequest.TYPES.Stylesheet,
     ]);
 
     const resourceUrl = record._url;
     return (
       CACHEABLE_STATUS_CODES.has(record.statusCode) &&
-      STATIC_RESOURCE_TYPES.has(record._resourceType) &&
+      STATIC_RESOURCE_TYPES.has(record._resourceType || 'Other') &&
       !resourceUrl.includes('data:')
     );
   }

lighthouse-core/audits/font-display.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const Audit = require('./audit');
-const WebInspector = require('../lib/web-inspector');
+const NetworkRequest = require('../lib/network-request');
 const allowedFontFaceDisplays = ['block', 'fallback', 'optional', 'swap'];
 
 class FontDisplay extends Audit {
@@ -40,7 +40,7 @@ class FontDisplay extends Audit {
 
     return artifacts.requestNetworkRecords(devtoolsLogs).then((networkRecords) => {
       const results = networkRecords.filter(record => {
-        const isFont = record._resourceType === WebInspector.resourceTypes.Font;
+        const isFont = record._resourceType === NetworkRequest.TYPES.Font;
 
         return isFont;
       })

lighthouse-core/audits/network-requests.js

@@ -46,7 +46,7 @@ class NetworkRequests extends Audit {
           transferSize: record.transferSize,
           statusCode: record.statusCode,
           mimeType: record._mimeType,
-          resourceType: record._resourceType && record._resourceType._name,
+          resourceType: record._resourceType,
         };
       });
 

lighthouse-core/gather/computed/critical-request-chains.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const ComputedArtifact = require('./computed-artifact');
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 const assert = require('assert');
 
 class CriticalRequestChains extends ComputedArtifact {
@@ -30,19 +30,19 @@ class CriticalRequestChains extends ComputedArtifact {
       return false;
     }
 
-    const resourceTypeCategory = request._resourceType && request._resourceType._category;
-
     // Iframes are considered High Priority but they are not render blocking
-    const isIframe = request._resourceType === WebInspector.resourceTypes.Document
+    const isIframe = request._resourceType === NetworkRequest.TYPES.Document
       && request._frameId !== mainResource._frameId;
     // XHRs are fetched at High priority, but we exclude them, as they are unlikely to be critical
     // Images are also non-critical.
-    // Treat any images missed by category, primarily favicons, as non-critical resources
+    // Treat any missed images, primarily favicons, as non-critical resources
     const nonCriticalResourceTypes = [
-      WebInspector.resourceTypes.Image._category,
-      WebInspector.resourceTypes.XHR._category,
+      NetworkRequest.TYPES.Image,
+      NetworkRequest.TYPES.XHR,
+      NetworkRequest.TYPES.Fetch,
+      NetworkRequest.TYPES.EventSource,
     ];
-    if (nonCriticalResourceTypes.includes(resourceTypeCategory) ||
+    if (nonCriticalResourceTypes.includes(request._resourceType || 'Other') ||
         isIframe ||
         request._mimeType && request._mimeType.startsWith('image/')) {
       return false;

lighthouse-core/gather/computed/metrics/lantern-interactive.js

@@ -7,7 +7,7 @@
 
 const MetricArtifact = require('./lantern-metric');
 const BaseNode = require('../../../lib/dependency-graph/base-node');
-const WebInspector = require('../../../lib/web-inspector');
+const NetworkRequest = require('../../../lib/network-request');
 
 /** @typedef {BaseNode.Node} Node */
 
@@ -45,8 +45,8 @@ class Interactive extends MetricArtifact {
       }
 
       // Include all scripts and high priority requests, exclude all images
-      const isImage = node.record._resourceType === WebInspector.resourceTypes.Image;
-      const isScript = node.record._resourceType === WebInspector.resourceTypes.Script;
+      const isImage = node.record._resourceType === NetworkRequest.TYPES.Image;
+      const isScript = node.record._resourceType === NetworkRequest.TYPES.Script;
       return (
         !isImage &&
         (isScript ||

lighthouse-core/gather/computed/metrics/lantern-metric.js

@@ -7,7 +7,7 @@
 
 const ComputedArtifact = require('../computed-artifact');
 const BaseNode = require('../../../lib/dependency-graph/base-node');
-const ResourceType = require('../../../../third-party/devtools/ResourceType');
+const NetworkRequest = require('../../../lib/network-request');
 
 /** @typedef {BaseNode.Node} Node */
 /** @typedef {import('../../../lib/dependency-graph/network-node')} NetworkNode */
@@ -25,7 +25,7 @@ class LanternMetricArtifact extends ComputedArtifact {
 
     dependencyGraph.traverse(node => {
       if (node.type === BaseNode.TYPES.CPU) return;
-      if (node.record._resourceType !== ResourceType.TYPES.Script) return;
+      if (node.record._resourceType !== NetworkRequest.TYPES.Script) return;
       if (condition && !condition(node)) return;
       scriptUrls.add(node.record.url);
     });

lighthouse-core/gather/computed/page-dependency-graph.js

@@ -10,7 +10,7 @@ const NetworkNode = require('../../lib/dependency-graph/network-node');
 const CPUNode = require('../../lib/dependency-graph/cpu-node');
 const NetworkAnalyzer = require('../../lib/dependency-graph/simulator/network-analyzer');
 const TracingProcessor = require('../../lib/traces/tracing-processor');
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 
 /** @typedef {import('../../lib/dependency-graph/base-node.js').Node} Node */
 
@@ -155,7 +155,7 @@ class PageDependencyGraphArtifact extends ComputedArtifact {
       const networkNode = networkNodeOutput.idToNodeMap.get(reqId);
       if (!networkNode ||
           // Ignore all non-XHRs
-          networkNode.record._resourceType !== WebInspector.resourceTypes.XHR ||
+          networkNode.record._resourceType !== NetworkRequest.TYPES.XHR ||
           // 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;

lighthouse-core/gather/computed/trace-of-tab.js

@@ -25,7 +25,7 @@ const Sentry = require('../../lib/sentry');
 // Bring in web-inspector for side effect of adding [].stableSort
 // See https://github.com/GoogleChrome/lighthouse/pull/2415
 // eslint-disable-next-line no-unused-vars
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 
 class TraceOfTab extends ComputedArtifact {
   get name() {

lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js

@@ -86,7 +86,7 @@ class OptimizedImages extends Gatherer {
 
       seenUrls.add(record._url);
       const isOptimizableImage = record._resourceType &&
-        record._resourceType._name === 'image' &&
+        record._resourceType === 'Image' &&
         /image\/(png|bmp|jpeg)/.test(record._mimeType);
       const isSameOrigin = URL.originsMatch(pageUrl, record._url);
       const isBase64DataUri = /^data:.{2,40}base64\s*,/.test(record._url);

lighthouse-core/gather/gatherers/dobetterweb/response-compression.js

@@ -11,12 +11,21 @@
 'use strict';
 
 const Gatherer = require('../gatherer');
+const NetworkRequest = require('../../../lib/network-request');
 const gzip = require('zlib').gzip;
 
+const CHROME_EXTENSION_PROTOCOL = 'chrome-extension:';
 const compressionHeaders = ['content-encoding', 'x-original-content-encoding'];
 const compressionTypes = ['gzip', 'br', 'deflate'];
 const binaryMimeTypes = ['image', 'audio', 'video'];
-const CHROME_EXTENSION_PROTOCOL = 'chrome-extension:';
+const textResourceTypes = [
+  NetworkRequest.TYPES.Document,
+  NetworkRequest.TYPES.Script,
+  NetworkRequest.TYPES.Stylesheet,
+  NetworkRequest.TYPES.XHR,
+  NetworkRequest.TYPES.Fetch,
+  NetworkRequest.TYPES.EventSource,
+];
 
 class ResponseCompression extends Gatherer {
   /**
@@ -29,14 +38,14 @@ class ResponseCompression extends Gatherer {
 
     networkRecords.forEach(record => {
       const mimeType = record._mimeType;
-      const resourceType = record._resourceType;
+      const resourceType = record._resourceType || NetworkRequest.TYPES.Other;
       const resourceSize = record._resourceSize;
 
       const isBinaryResource = mimeType && binaryMimeTypes.some(type => mimeType.startsWith(type));
-      const isTextBasedResource = !isBinaryResource && resourceType && resourceType.isTextType();
+      const isTextResource = !isBinaryResource && textResourceTypes.includes(resourceType);
       const isChromeExtensionResource = record.url.startsWith(CHROME_EXTENSION_PROTOCOL);
 
-      if (!isTextBasedResource || !resourceSize || !record.finished ||
+      if (!isTextResource || !resourceSize || !record.finished ||
         isChromeExtensionResource || !record.transferSize || record.statusCode === 304) {
         return;
       }

lighthouse-core/gather/gatherers/scripts.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const Gatherer = require('./gatherer');
-const WebInspector = require('../../lib/web-inspector');
+const NetworkRequest = require('../../lib/network-request');
 
 /**
  * @fileoverview Gets JavaScript file contents.
@@ -23,7 +23,7 @@ class Scripts extends Gatherer {
     /** @type {Object<string, string>} */
     const scriptContentMap = {};
     const scriptRecords = loadData.networkRecords
-      .filter(record => record._resourceType === WebInspector.resourceTypes.Script);
+      .filter(record => record._resourceType === NetworkRequest.TYPES.Script);
 
     for (const record of scriptRecords) {
       try {

lighthouse-core/lib/dependency-graph/network-node.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const BaseNode = require('./base-node');
-const WebInspector = require('../web-inspector');
+const NetworkRequest = require('../network-request');
 
 class NetworkNode extends BaseNode {
   /**
@@ -62,8 +62,8 @@ class NetworkNode extends BaseNode {
    */
   hasRenderBlockingPriority() {
     const priority = this._record.priority();
-    const isScript = this._record._resourceType === WebInspector.resourceTypes.Script;
-    const isDocument = this._record._resourceType === WebInspector.resourceTypes.Document;
+    const isScript = this._record._resourceType === NetworkRequest.TYPES.Script;
+    const isDocument = this._record._resourceType === NetworkRequest.TYPES.Document;
     const isBlockingScript = priority === 'High' && isScript;
     const isBlockingHtmlImport = priority === 'High' && isDocument;
     return priority === 'VeryHigh' || isBlockingScript || isBlockingHtmlImport;

lighthouse-core/lib/dependency-graph/simulator/network-analyzer.js

@@ -6,7 +6,7 @@
 'use strict';
 
 const INITIAL_CWD = 14 * 1024;
-const WebInspector = require('../../web-inspector');
+const NetworkRequest = require('../../network-request');
 
 class NetworkAnalyzer {
   /**
@@ -328,7 +328,7 @@ class NetworkAnalyzer {
   static findMainDocument(records) {
     // TODO(phulce): handle more edge cases like client redirects, or plumb through finalUrl
     const documentRequests = records.filter(record => record._resourceType ===
-        WebInspector.resourceTypes.Document);
+        NetworkRequest.TYPES.Document);
     return documentRequests.sort((a, b) => a.startTime - b.startTime)[0];
   }
 }