lighthouse 12.0.0-dev.20240513 → 12.0.0-dev.20240514

package/cli/run.js

@@ -9,7 +9,6 @@
 import path from 'path';
 import os from 'os';
 
-import psList from 'ps-list';
 import * as ChromeLauncher from 'chrome-launcher';
 import yargsParser from 'yargs-parser';
 import log from 'lighthouse-logger';
@@ -176,36 +175,6 @@ async function saveResults(runnerResult, flags) {
   }
 }
 
-/**
- * Attempt to kill the launched Chrome, if defined.
- * @param {ChromeLauncher.LaunchedChrome=} launchedChrome
- * @return {Promise<void>}
- */
-async function potentiallyKillChrome(launchedChrome) {
-  if (!launchedChrome) return;
-
-  /** @type {NodeJS.Timeout} */
-  let timeout;
-  const timeoutPromise = new Promise((_, reject) => {
-    timeout = setTimeout(reject, 5000, new Error('Timed out waiting to kill Chrome'));
-  });
-
-  return Promise.race([
-    launchedChrome.kill(),
-    timeoutPromise,
-  ]).catch(async err => {
-    const runningProcesses = await psList();
-    if (!runningProcesses.some(proc => proc.pid === launchedChrome.pid)) {
-      log.warn('CLI', 'Warning: Chrome process could not be killed because it already exited.');
-      return;
-    }
-
-    throw new Error(`Couldn't quit Chrome process. ${err}`);
-  }).finally(() => {
-    clearTimeout(timeout);
-  });
-}
-
 /**
  * @param {string} url
  * @param {LH.CliFlags} flags
@@ -214,12 +183,10 @@ async function potentiallyKillChrome(launchedChrome) {
  */
 async function runLighthouse(url, flags, config) {
   /** @param {any} reason */
-  async function handleTheUnhandled(reason) {
+  function handleTheUnhandled(reason) {
     process.stderr.write(`Unhandled Rejection. Reason: ${reason}\n`);
-    await potentiallyKillChrome(launchedChrome).catch(() => {});
-    setTimeout(_ => {
-      process.exit(1);
-    }, 100);
+    launchedChrome?.kill();
+    process.exit(1);
   }
   process.on('unhandledRejection', handleTheUnhandled);
 
@@ -247,7 +214,7 @@ async function runLighthouse(url, flags, config) {
       await saveResults(runnerResult, flags);
     }
 
-    await potentiallyKillChrome(launchedChrome);
+    launchedChrome?.kill();
     process.removeListener('unhandledRejection', handleTheUnhandled);
 
     // Runtime errors indicate something was *very* wrong with the page result.
@@ -265,7 +232,7 @@ async function runLighthouse(url, flags, config) {
 
     return runnerResult;
   } catch (err) {
-    await potentiallyKillChrome(launchedChrome).catch(() => {});
+    launchedChrome?.kill();
     return printErrorAndExit(err);
   }
 }

package/cli/test/smokehouse/lighthouse-runners/bundle.js

@@ -97,7 +97,7 @@ async function runBundledLighthouse(url, config, testRunnerOptions) {
     };
   } finally {
     // Clean up and return results.
-    await launchedChrome.kill();
+    launchedChrome.kill();
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "12.0.0-dev.20240513",
+  "version": "12.0.0-dev.20240514",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {
@@ -198,7 +198,6 @@
     "metaviewport-parser": "0.3.0",
     "open": "^8.4.0",
     "parse-cache-control": "1.0.1",
-    "ps-list": "^8.0.0",
     "puppeteer-core": "^22.6.5",
     "robots-parser": "^3.0.1",
     "semver": "^5.3.0",