core(network): revert strict wrapping of network requests (#16949)

Author: lusayaa

cli/test/smokehouse/test-definitions/redirects-scripts.js

@@ -35,7 +35,7 @@ const expectations = {
               // This check ensures that we resolve the redirect and use the final redirect network request to compute savings.
               // We can distinguish using totalBytes because the final request is compressed while the redirect request is not.
               url: 'http://localhost:10200/simple-script.js?redirect=%2Funused-javascript.js%3Fgzip%3D1',
-              totalBytes: '285000 +/- 2000',
+              totalBytes: '285000 +/- 4000',
             },
           ],
         },

core/computed/main-resource.js

@@ -7,7 +7,6 @@
 import * as Lantern from '../lib/lantern/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
-import {NetworkRequest} from '../lib/network-request.js';
 
 /**
  * @fileoverview This artifact identifies the main resource on the page. Current solution assumes
@@ -30,14 +29,16 @@ class MainResource {
     // would have evicted the first request by the time `MainDocumentRequest` (a consumer
     // of this computed artifact) attempts to fetch the contents, resulting in a protocol error.
     const mainResource = Lantern.Core.NetworkAnalyzer.findLastDocumentForUrl(
-      records.map(NetworkRequest.asLanternNetworkRequest),
+      // @ts-expect-error - trace engine types for InitiatorType are outdated
+      records,
       mainDocumentUrl
     );
-    if (!mainResource?.rawRequest) {
+    if (!mainResource) {
       throw new Error('Unable to identify the main resource');
     }
 
-    return mainResource.rawRequest;
+    // @ts-expect-error - Return type is typed as Lantern request by trace engine, but it is a raw record at runtime since we passed raw records.
+    return mainResource;
   }
 }
 

core/computed/network-analysis.js

@@ -9,7 +9,6 @@ import log from 'lighthouse-logger';
 import * as Lantern from '../lib/lantern/lantern.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
-import {NetworkRequest} from '../lib/network-request.js';
 
 class NetworkAnalysis {
   /**
@@ -20,7 +19,8 @@ class NetworkAnalysis {
   static async compute_(devtoolsLog, context) {
     const records = await NetworkRecords.request(devtoolsLog, context);
     const analysis = Lantern.Core.NetworkAnalyzer.analyze(
-      records.map(NetworkRequest.asLanternNetworkRequest)
+      // @ts-expect-error - trace engine types for InitiatorType are outdated
+      records
     );
     if (!analysis) {
       log.error('NetworkAnalysis', 'Network analysis failed due to lack of transfer data');

core/lib/navigation-error.js

@@ -131,10 +131,11 @@ function getNonHtmlError(finalRecord) {
 function getPageLoadError(navigationError, context) {
   const {url, networkRecords} = context;
   const mainRecordLantern = Lantern.Core.NetworkAnalyzer.findResourceForUrl(
-    networkRecords.map(NetworkRequest.asLanternNetworkRequest),
+    // @ts-expect-error - trace engine types for InitiatorType are outdated
+    networkRecords,
     url
   );
-  let mainRecord = mainRecordLantern?.rawRequest;
+  let mainRecord = mainRecordLantern;
 
   // If the url doesn't give us a network request, it's possible we landed on a chrome-error:// page
   // In this case, just get the first document request.
@@ -143,6 +144,7 @@ function getPageLoadError(navigationError, context) {
       record.resourceType === NetworkRequest.TYPES.Document
     );
     if (documentRequests.length) {
+      // @ts-expect-error - mainRecord is inferred as a Lantern request from findResourceForUrl, but we assign a raw record here.
       mainRecord = documentRequests.reduce((min, r) => {
         return r.networkRequestTime < min.networkRequestTime ? r : min;
       });
@@ -152,9 +154,7 @@ function getPageLoadError(navigationError, context) {
   // MIME Type is only set on the final redirected document request. Use this for the HTML check instead of root.
   let finalRecord;
   if (mainRecord) {
-    const mainRecordLantern = NetworkRequest.asLanternNetworkRequest(mainRecord);
-    const finalRecordLantern = Lantern.Core.NetworkAnalyzer.resolveRedirects(mainRecordLantern);
-    finalRecord = finalRecordLantern?.rawRequest || finalRecordLantern;
+    finalRecord = Lantern.Core.NetworkAnalyzer.resolveRedirects(mainRecord);
   } else {
     // We have no network requests to process, use the navError
     return navigationError;
@@ -164,7 +164,9 @@ function getPageLoadError(navigationError, context) {
     context.warnings.push(str_(UIStrings.warningXhtml));
   }
 
+  // @ts-expect-error - mainRecord may be typed as a Lantern request, but functions expect a raw record.
   const networkError = getNetworkError(mainRecord, context);
+  // @ts-expect-error - mainRecord may be typed as a Lantern request, but functions expect a raw record.
   const interstitialError = getInterstitialError(mainRecord, networkRecords);
   // @ts-expect-error - finalRecord may be a Lantern request, which is compatible enough
   // for getNonHtmlError.