Revert "+ runner state"

This reverts commit cd390a4.

lighthouse-core/fraggle-rock/gather/navigation-runner.js

@@ -287,8 +287,7 @@ async function navigation(options) {
     skipAboutBlank: configContext.skipAboutBlank,
   };
 
-  const runner = new Runner(config, computedCache);
-  await runner.gatherPhase(
+  const gatherResult = await Runner.gatherPhase(
     async () => {
       const driver = new Driver(page);
       const requestedUrl = URL.normalizeUrl(url);
@@ -298,9 +297,13 @@ async function navigation(options) {
       await _cleanup(context);
 
       return finalizeArtifacts(baseArtifacts, artifacts);
+    },
+    {
+      config,
+      computedCache,
     }
   );
-  return runner.auditPhase();
+  return Runner.auditPhase(gatherResult);
 }
 
 module.exports = {

lighthouse-core/fraggle-rock/gather/snapshot-runner.js

@@ -26,8 +26,7 @@ async function snapshot(options) {
   const computedCache = new Map();
   const url = await options.page.url();
 
-  const runner = new Runner(config, computedCache);
-  await runner.gatherPhase(
+  const gatherResult = await Runner.gatherPhase(
     async () => {
       const baseArtifacts = await getBaseArtifacts(config, driver, {gatherMode: 'snapshot'});
       baseArtifacts.URL.requestedUrl = url;
@@ -50,9 +49,13 @@ async function snapshot(options) {
 
       const artifacts = await awaitArtifacts(artifactState);
       return finalizeArtifacts(baseArtifacts, artifacts);
+    },
+    {
+      config,
+      computedCache,
     }
   );
-  return runner.auditPhase();
+  return Runner.auditPhase(gatherResult);
 }
 
 module.exports = {

lighthouse-core/fraggle-rock/gather/timespan-runner.js

@@ -50,8 +50,7 @@ async function startTimespan(options) {
   return {
     async endTimespan() {
       const finalUrl = await options.page.url();
-      const runner = new Runner(config, computedCache);
-      await runner.gatherPhase(
+      const gatherResult = await Runner.gatherPhase(
         async () => {
           baseArtifacts.URL.requestedUrl = requestedUrl;
           baseArtifacts.URL.finalUrl = finalUrl;
@@ -63,9 +62,13 @@ async function startTimespan(options) {
 
           const artifacts = await awaitArtifacts(artifactState);
           return finalizeArtifacts(baseArtifacts, artifacts);
+        },
+        {
+          config,
+          computedCache,
         }
       );
-      return runner.auditPhase();
+      return Runner.auditPhase(gatherResult);
     },
   };
 }

lighthouse-core/index.js

@@ -47,12 +47,11 @@ async function lighthouse(url, flags = {}, configJSON, userConnection) {
   const connection = userConnection || new ChromeProtocol(flags.port, flags.hostname);
 
   // kick off a lighthouse run
-  const runner = new Runner(config, computedCache);
-  await runner.gatherPhase(() => {
+  const gatherResult = await Runner.gatherPhase(() => {
     const requestedUrl = URL.normalizeUrl(url);
     return Runner._gatherArtifactsFromBrowser(requestedUrl, options, connection);
-  });
-  return runner.auditPhase();
+  }, options);
+  return Runner.auditPhase(gatherResult);
 }
 
 /**

lighthouse-core/runner.js

@@ -25,30 +25,14 @@ const {version: lighthouseVersion} = require('../package.json');
 /** @typedef {import('./lib/arbitrary-equality-map.js')} ArbitraryEqualityMap */
 /** @typedef {LH.Config.Config} Config */
 
-/**
- * @template {LH.Config.Config | LH.Config.FRConfig} TConfig
- */
 class Runner {
   /**
-   * @param {TConfig} config
-   * @param {Map<string, ArbitraryEqualityMap>=} computedCache
-   */
-  constructor(config, computedCache) {
-    /** @type {LH.Artifacts|undefined} */
-    this.artifacts = undefined;
-    /** @type {TConfig} */
-    this.config = config;
-    /** @type {Map<string, ArbitraryEqualityMap>} */
-    this.computedCache = computedCache || new Map();
-  }
-
-  /**
+   * @template {LH.Config.Config | LH.Config.FRConfig} TConfig
+   * @param {LH.Gatherer.GatherResult<TConfig>} gatherResult
    * @return {Promise<LH.RunnerResult|undefined>}
    */
-  async auditPhase() {
-    const {artifacts, config, computedCache} = this;
-    if (!artifacts) throw new Error('Must run gather phase before audit phase');
-
+  static async auditPhase(gatherResult) {
+    const {artifacts, config, computedCache} = gatherResult;
     const settings = config.settings;
     try {
       const runnerStatus = {msg: 'Audit phase', id: 'lh:runner:auditPhase'};
@@ -117,7 +101,7 @@ class Runner {
         categories,
         categoryGroups: config.groups || undefined,
         stackPacks: stackPacks.getStackPacks(artifacts.Stacks),
-        timing: Runner._getTiming(artifacts),
+        timing: this._getTiming(artifacts),
         i18n: {
           rendererFormattedStrings: format.getRendererFormattedStrings(settings.locale),
           icuMessagePaths: {},
@@ -150,12 +134,13 @@ class Runner {
    * -G and -A will run partial lighthouse pipelines,
    * and -GA will run everything plus save artifacts and lhr to disk.
    *
+   * @template {LH.Config.Config | LH.Config.FRConfig} TConfig
    * @param {(runnerData: {config: TConfig, driverMock?: Driver}) => Promise<LH.Artifacts>} gatherFn
-   * @param {{driverMock?: Driver}=} options
-   * @return {Promise<LH.Artifacts>}
+   * @param {{config: TConfig, driverMock?: Driver, computedCache: Map<string, ArbitraryEqualityMap>}} options
+   * @return {Promise<LH.Gatherer.GatherResult<TConfig>>}
    */
-  async gatherPhase(gatherFn, options) {
-    const settings = this.config.settings;
+  static async gatherPhase(gatherFn, options) {
+    const settings = options.config.settings;
 
     // Gather phase
     // Either load saved artifacts from disk or from the browser.
@@ -174,7 +159,7 @@ class Runner {
       let artifacts;
       if (settings.auditMode && !settings.gatherMode) {
         // No browser required, just load the artifacts from disk.
-        const path = Runner._getDataSavePath(settings);
+        const path = this._getDataSavePath(settings);
         artifacts = assetSaver.loadArtifacts(path);
         const requestedUrl = artifacts.URL.requestedUrl;
 
@@ -183,21 +168,20 @@ class Runner {
         }
       } else {
         artifacts = await gatherFn({
-          config: this.config,
-          driverMock: options?.driverMock,
+          config: options.config,
+          driverMock: options.driverMock,
         });
 
         // -G means save these to disk (e.g. ./latest-run).
         if (settings.gatherMode) {
-          const path = Runner._getDataSavePath(settings);
+          const path = this._getDataSavePath(settings);
           await assetSaver.saveArtifacts(artifacts, path);
         }
       }
 
       log.timeEnd(runnerStatus);
 
-      this.artifacts = artifacts;
-      return artifacts;
+      return {artifacts, config: options.config, computedCache: options.computedCache};
     } catch (err) {
       throw Runner.createRunnerError(err, settings);
     }

types/gatherer.d.ts

@@ -121,6 +121,12 @@ declare module Gatherer {
 
   type FRGatherPhase = keyof Omit<Gatherer.FRGathererInstance, 'name'|'meta'>
 
+  interface GatherResult<TConfig extends LH.Config.Config | LH.Config.FRConfig> {
+    artifacts: Artifacts;
+    config: TConfig;
+    computedCache: Map<string, ArbitraryEqualityMap>;
+  }
+
   interface FRGathererInstance<TDependencies extends DependencyKey = DefaultDependenciesKey> {
     name: keyof GathererArtifacts; // temporary COMPAT measure until artifact config support is available
     meta: GathererMeta<TDependencies>;