lighthouse 11.6.0-dev.20240221 → 11.6.0-dev.20240223

package/core/gather/gatherers/devtools-log.d.ts

@@ -12,6 +12,10 @@ declare class DevtoolsLog extends BaseGatherer {
      * @param {LH.Gatherer.Context} passContext
      */
     stopSensitiveInstrumentation({ driver }: LH.Gatherer.Context): Promise<void>;
+    /**
+     * @return {LH.Artifacts['DevtoolsLog']}
+     */
+    getDebugData(): LH.Artifacts['DevtoolsLog'];
     /**
      * @return {Promise<LH.Artifacts['DevtoolsLog']>}
      */

package/core/gather/gatherers/devtools-log.js

@@ -49,6 +49,13 @@ class DevtoolsLog extends BaseGatherer {
     driver.targetManager.off('protocolevent', this._onProtocolMessage);
   }
 
+  /**
+   * @return {LH.Artifacts['DevtoolsLog']}
+   */
+  getDebugData() {
+    return this._messageLog.messages;
+  }
+
   /**
    * @return {Promise<LH.Artifacts['DevtoolsLog']>}
    */

package/core/gather/gatherers/trace.d.ts

@@ -17,6 +17,7 @@ declare class Trace extends BaseGatherer {
      * @param {LH.Gatherer.Context} passContext
      */
     stopSensitiveInstrumentation({ driver }: LH.Gatherer.Context): Promise<void>;
+    getDebugData(): import("../../index.js").Trace;
     getArtifact(): import("../../index.js").Trace;
 }
 import BaseGatherer from '../base-gatherer.js';

package/core/gather/gatherers/trace.js

@@ -126,6 +126,10 @@ class Trace extends BaseGatherer {
     this._trace = await Trace.endTraceAndCollectEvents(driver.defaultSession);
   }
 
+  getDebugData() {
+    return this._trace;
+  }
+
   getArtifact() {
     return this._trace;
   }

package/core/gather/navigation-runner.js

@@ -110,32 +110,20 @@ async function _navigate(navigationContext) {
  * @return {Promise<{devtoolsLog?: LH.DevtoolsLog, records?: Array<LH.Artifacts.NetworkRequest>, trace?: LH.Trace}>}
  */
 async function _collectDebugData(navigationContext, phaseState) {
-  const devtoolsLogArtifactDefn = phaseState.artifactDefinitions.find(
-    definition => definition.gatherer.instance.meta.symbol === DevtoolsLog.symbol
-  );
-  const traceArtifactDefn = phaseState.artifactDefinitions.find(
-    definition => definition.gatherer.instance.meta.symbol === Trace.symbol
-  );
-
-  const artifactDefinitions = [devtoolsLogArtifactDefn, traceArtifactDefn].filter(
-    /**
-     * @param {LH.Config.AnyArtifactDefn | undefined} defn
-     * @return {defn is LH.Config.AnyArtifactDefn}
-     */
-    defn => Boolean(defn)
-  );
-  if (!artifactDefinitions.length) return {};
-
-  await collectPhaseArtifacts({...phaseState, phase: 'getArtifact', artifactDefinitions});
-  const getArtifactState = phaseState.artifactState.getArtifact;
+  let devtoolsLog;
+  let trace;
+
+  for (const definition of phaseState.artifactDefinitions) {
+    const {instance} = definition.gatherer;
+    if (instance instanceof DevtoolsLog) {
+      devtoolsLog = instance.getDebugData();
+    } else if (instance instanceof Trace) {
+      trace = instance.getDebugData();
+    }
+  }
 
-  const devtoolsLogArtifactId = devtoolsLogArtifactDefn?.id;
-  const devtoolsLog = devtoolsLogArtifactId && (await getArtifactState[devtoolsLogArtifactId]);
   const records = devtoolsLog && (await NetworkRecords.request(devtoolsLog, navigationContext));
 
-  const traceArtifactId = traceArtifactDefn?.id;
-  const trace = traceArtifactId && (await getArtifactState[traceArtifactId]);
-
   return {devtoolsLog, records, trace};
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "11.6.0-dev.20240221",
+  "version": "11.6.0-dev.20240223",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {