lighthouse 12.0.0-dev.20240602 → 12.0.0-dev.20240604

package/core/lib/lantern-trace-saver.js

@@ -33,7 +33,7 @@ function convertNodeTimingsToTrace(nodeTimings) {
       traceEvents.push(...createFakeTaskEvents(node, timing));
     } else {
       /** @type {LH.Artifacts.NetworkRequest} */
-      const record = node.record;
+      const record = node.rawRequest;
       // Ignore data URIs as they don't really add much value
       if (/^data/.test(record.url)) continue;
       traceEvents.push(...createFakeNetworkEvents(requestId, record, timing));

package/core/lib/network-request.d.ts

@@ -149,6 +149,7 @@ export class NetworkRequest {
     sessionId: string | undefined;
     /** @type {LH.Protocol.TargetType|undefined} */
     sessionTargetType: LH.Protocol.TargetType | undefined;
+    fromWorker: boolean;
     isLinkPreload: boolean;
     /**
      * @return {boolean}
@@ -258,6 +259,26 @@ export namespace NetworkRequest {
     export { HEADER_FETCHED_SIZE };
     export { HEADER_PROTOCOL_IS_H2 };
 }
+/**
+ * @typedef HeaderEntry
+ * @property {string} name
+ * @property {string} value
+ */
+/**
+ * @typedef ParsedURL
+ * @property {string} scheme Equivalent to a `new URL(url).protocol` BUT w/o the trailing colon (:)
+ * @property {string} host Equivalent to a `new URL(url).hostname`
+ * @property {string} securityOrigin
+ */
+/**
+ * @typedef LightriderStatistics
+ * @property {number} endTimeDeltaMs The difference in networkEndTime between the observed Lighthouse networkEndTime and Lightrider's derived networkEndTime.
+ * @property {number} TCPMs The time spent making a TCP connection (connect + SSL). Note: this is poorly named.
+ * @property {number} requestMs The time spent requesting a resource from a remote server, we use this to approx RTT. Note: this is poorly names, it really should be "server response time".
+ * @property {number} responseMs Time to receive the entire response payload starting the clock on receiving the first fragment (first non-header byte).
+ */
+/** @type {LH.Util.SelfMap<LH.Crdp.Network.ResourceType>} */
+export const RESOURCE_TYPES: LH.Util.SelfMap<LH.Crdp.Network.ResourceType>;
 import * as LH from '../../types/lh.js';
 import * as Lantern from './lantern/types/lantern.js';
 declare const HEADER_TCP: "X-TCPMs";

package/core/lib/network-request.js

@@ -180,6 +180,7 @@ class NetworkRequest {
     this.sessionId = undefined;
     /** @type {LH.Protocol.TargetType|undefined} */
     this.sessionTargetType = undefined;
+    this.fromWorker = false;
     this.isLinkPreload = false;
   }
 
@@ -600,11 +601,13 @@ class NetworkRequest {
       }
     }
 
+    record.fromWorker = record.sessionTargetType === 'worker';
+
     return {
+      rawRequest: record,
       ...record,
       timing,
       serverResponseTime,
-      record,
     };
   }
 
@@ -691,4 +694,4 @@ NetworkRequest.HEADER_TOTAL = HEADER_TOTAL;
 NetworkRequest.HEADER_FETCHED_SIZE = HEADER_FETCHED_SIZE;
 NetworkRequest.HEADER_PROTOCOL_IS_H2 = HEADER_PROTOCOL_IS_H2;
 
-export {NetworkRequest};
+export {NetworkRequest, RESOURCE_TYPES};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "12.0.0-dev.20240602",
+  "version": "12.0.0-dev.20240604",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {
@@ -51,17 +51,19 @@
     "test-proto": "yarn compile-proto && yarn build-proto-roundtrip",
     "unit-core": "yarn mocha core",
     "unit-cli": "yarn mocha --testMatch cli/**/*-test.js",
+    "unit-lantern-trace": "INTERNAL_LANTERN_USE_TRACE=1 yarn mocha core/test/computed/metrics core/test/audits",
     "unit-report": "yarn mocha --testMatch report/**/*-test.js",
     "unit-treemap": "yarn mocha --testMatch treemap/**/*-test.js",
     "unit-viewer": "yarn mocha --testMatch viewer/**/*-test.js",
     "unit-flow": "bash flow-report/test/run-flow-report-tests.sh",
-    "unit": "yarn unit-flow && yarn mocha",
+    "unit": "yarn unit-flow && yarn mocha && yarn unit-lantern-trace",
     "unit:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run unit",
+    "unit-lantern-trace:ci": "NODE_OPTIONS=--max-old-space-size=8192 npm run unit-lantern-trace",
     "core-unit": "yarn unit-core",
     "cli-unit": "yarn unit-cli",
     "viewer-unit": "yarn unit-viewer",
     "watch": "yarn unit-core --watch",
-    "unit:cicoverage": "yarn c8 --all yarn unit:ci",
+    "unit:cicoverage": "yarn c8 --all yarn unit:ci && yarn c8 --all yarn unit-lantern-trace:ci",
     "coverage": "yarn unit:cicoverage && c8 report --reporter html",
     "coverage:smoke": "yarn c8 yarn smoke -j=1 && c8 report --reporter html",
     "devtools": "bash core/scripts/roll-to-devtools.sh",
@@ -179,7 +181,7 @@
     "webtreemap-cdt": "^3.2.1"
   },
   "dependencies": {
-    "@paulirish/trace_engine": "^0.0.19",
+    "@paulirish/trace_engine": "^0.0.23",
     "@sentry/node": "^6.17.4",
     "axe-core": "^4.9.0",
     "chrome-launcher": "^1.1.1",

package/tsconfig.json

@@ -109,5 +109,6 @@
     "core/test/computed/metrics/interactive-test.js",
     "core/test/computed/tbt-impact-tasks-test.js",
     "core/test/fixtures/config-plugins/lighthouse-plugin-simple/plugin-simple.js",
+    "core/test/lib/lantern/metrics/metric-test-utils.js",
   ],
 }

package/types/artifacts.d.ts

@@ -942,6 +942,22 @@ export interface TraceEvent {
       name?: string;
       duration?: number;
       blockingDuration?: number;
+      candidateIndex?: number;
+      priority?: string;
+      requestMethod?: string;
+      resourceType?: string;
+      fromCache?: boolean;
+      fromServiceWorker?: boolean;
+      mimeType?: string;
+      statusCode?: number;
+      timing?: any;
+      connectionId?: number;
+      connectionReused?: boolean;
+      encodedDataLength?: number;
+      decodedBodyLength?: number;
+      initiator?: {type: string, url?: string, stack?: any};
+      protocol?: string;
+      finishTime?: number;
     };
     frame?: string;
     name?: string;