lighthouse 12.0.0-dev.20240512 → 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/core/gather/driver/navigation.js

@@ -123,7 +123,7 @@ async function gotoURL(driver, requestor, options) {
   }
 
   const waitConditions = await Promise.race([
-    driver.fatalRejection.promise,
+    session.onCrashPromise(),
     Promise.all(waitConditionPromises),
   ]);
   const timedOut = waitConditions.some(condition => condition.timedOut);

package/core/gather/driver.d.ts

@@ -14,10 +14,6 @@ export class Driver implements LH.Gatherer.Driver {
     /** @type {Fetcher|undefined} */
     _fetcher: Fetcher | undefined;
     defaultSession: import("../../types/gatherer.js").default.ProtocolSession;
-    fatalRejection: {
-        promise: Promise<never>;
-        rej: (_: Error) => void;
-    };
     /** @return {LH.Gatherer.Driver['executionContext']} */
     get executionContext(): ExecutionContext;
     get fetcher(): any;
@@ -27,14 +23,6 @@ export class Driver implements LH.Gatherer.Driver {
     url(): Promise<string>;
     /** @return {Promise<void>} */
     connect(): Promise<void>;
-    /**
-     * If the target crashes, we can't continue gathering.
-     *
-     * FWIW, if the target unexpectedly detaches (eg the user closed the tab), pptr will
-     * catch that and reject into our this._cdpSession.send, which we'll alrady handle appropriately
-     * @return {void}
-     */
-    listenForCrashes(): void;
     /** @return {Promise<void>} */
     disconnect(): Promise<void>;
 }

package/core/gather/driver.js

@@ -8,7 +8,6 @@ import log from 'lighthouse-logger';
 
 import {ExecutionContext} from './driver/execution-context.js';
 import {TargetManager} from './driver/target-manager.js';
-import {LighthouseError} from '../lib/lh-error.js';
 import {Fetcher} from './fetcher.js';
 import {NetworkMonitor} from './driver/network-monitor.js';
 
@@ -29,6 +28,7 @@ const throwingSession = {
   sendCommand: throwNotConnectedFn,
   sendCommandAndIgnore: throwNotConnectedFn,
   dispose: throwNotConnectedFn,
+  onCrashPromise: throwNotConnectedFn,
 };
 
 /** @implements {LH.Gatherer.Driver} */
@@ -48,12 +48,6 @@ class Driver {
     this._fetcher = undefined;
 
     this.defaultSession = throwingSession;
-
-    // Poor man's Promise.withResolvers()
-    /** @param {Error} _ */
-    let rej = _ => {};
-    const promise = /** @type {Promise<never>} */ (new Promise((_, theRej) => rej = theRej));
-    this.fatalRejection = {promise, rej};
   }
 
   /** @return {LH.Gatherer.Driver['executionContext']} */
@@ -93,30 +87,11 @@ class Driver {
     this._networkMonitor = new NetworkMonitor(this._targetManager);
     await this._networkMonitor.enable();
     this.defaultSession = this._targetManager.rootSession();
-    this.listenForCrashes();
     this._executionContext = new ExecutionContext(this.defaultSession);
     this._fetcher = new Fetcher(this.defaultSession);
     log.timeEnd(status);
   }
 
-  /**
-   * If the target crashes, we can't continue gathering.
-   *
-   * FWIW, if the target unexpectedly detaches (eg the user closed the tab), pptr will
-   * catch that and reject into our this._cdpSession.send, which we'll alrady handle appropriately
-   * @return {void}
-   */
-  listenForCrashes() {
-    this.defaultSession.on('Inspector.targetCrashed', async _ => {
-      log.error('Driver', 'Inspector.targetCrashed');
-      // Manually detach so no more CDP traffic is attempted.
-      // Don't await, else our rejection will be a 'Target closed' protocol error on cross-talk CDP calls.
-      void this.defaultSession.dispose();
-      this.fatalRejection.rej(new LighthouseError(LighthouseError.errors.TARGET_CRASHED));
-    });
-  }
-
-
   /** @return {Promise<void>} */
   async disconnect() {
     if (this.defaultSession === throwingSession) return;

package/core/gather/gatherers/inspector-issues.js

@@ -80,6 +80,7 @@ class InspectorIssues extends BaseGatherer {
       quirksModeIssue: [],
       cookieIssue: [],
       sharedArrayBufferIssue: [],
+      sharedDictionaryIssue: [],
       stylesheetLoadingIssue: [],
       federatedAuthUserInfoRequestIssue: [],
     };

package/core/gather/session.d.ts

@@ -18,6 +18,7 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @param {LH.CrdpEvents[E]} params
      */
     _handleProtocolEvent<E extends keyof import("puppeteer-core").ProtocolMapping.Events>(method: E, ...params: import("puppeteer-core").ProtocolMapping.Events[E]): void;
+    _targetCrashedPromise: Promise<never>;
     id(): string;
     /** @param {LH.Crdp.Target.TargetInfo} targetInfo */
     setTargetInfo(targetInfo: LH.Crdp.Target.TargetInfo): void;
@@ -53,6 +54,7 @@ export class ProtocolSession extends ProtocolSession_base implements LH.Gatherer
      * @return {Promise<void>}
      */
     dispose(): Promise<void>;
+    onCrashPromise(): Promise<never>;
 }
 export {};
 //# sourceMappingURL=session.d.ts.map

package/core/gather/session.js

@@ -44,6 +44,22 @@ class ProtocolSession extends CrdpEventEmitter {
     this._handleProtocolEvent = this._handleProtocolEvent.bind(this);
     // @ts-expect-error Puppeteer expects the handler params to be type `unknown`
     this._cdpSession.on('*', this._handleProtocolEvent);
+
+    // If the target crashes, we can't continue gathering.
+    // FWIW, if the target unexpectedly detaches (eg the user closed the tab), pptr will
+    // catch that and reject in this._cdpSession.send, which is caught by us.
+    /** @param {Error} _ */
+    let rej = _ => {}; // Poor man's Promise.withResolvers()
+    this._targetCrashedPromise = /** @type {Promise<never>} */ (
+      new Promise((_, theRej) => rej = theRej));
+    this.on('Inspector.targetCrashed', async () => {
+      log.error('TargetManager', 'Inspector.targetCrashed');
+      // Manually detach so no more CDP traffic is attempted.
+      // Don't await, else our rejection will be a 'Target closed' protocol error on cross-talk
+      // CDP calls.
+      void this.dispose();
+      rej(new LighthouseError(LighthouseError.errors.TARGET_CRASHED));
+    });
   }
 
   id() {
@@ -114,7 +130,8 @@ class ProtocolSession extends CrdpEventEmitter {
       log.formatProtocol('method <= browser ERR', {method}, 'error');
       throw LighthouseError.fromProtocolMessage(method, error);
     });
-    const resultWithTimeoutPromise = Promise.race([resultPromise, timeoutPromise]);
+    const resultWithTimeoutPromise =
+      Promise.race([resultPromise, timeoutPromise, this._targetCrashedPromise]);
 
     return resultWithTimeoutPromise.finally(() => {
       if (timeout) clearTimeout(timeout);
@@ -142,6 +159,10 @@ class ProtocolSession extends CrdpEventEmitter {
     this._cdpSession.off('*', this._handleProtocolEvent);
     await this._cdpSession.detach().catch(e => log.verbose('session', 'detach failed', e.message));
   }
+
+  onCrashPromise() {
+    return this._targetCrashedPromise;
+  }
 }
 
 export {ProtocolSession};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "12.0.0-dev.20240512",
+  "version": "12.0.0-dev.20240514",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {
@@ -185,7 +185,7 @@
     "chrome-launcher": "^1.1.1",
     "configstore": "^5.0.1",
     "csp_evaluator": "1.1.1",
-    "devtools-protocol": "0.0.1232444",
+    "devtools-protocol": "0.0.1299070",
     "enquirer": "^2.3.6",
     "http-link-header": "^1.1.1",
     "intl-messageformat": "^10.5.3",
@@ -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",
@@ -210,8 +209,8 @@
     "yargs-parser": "^21.0.0"
   },
   "resolutions": {
-    "puppeteer/**/devtools-protocol": "0.0.1232444",
-    "puppeteer-core/**/devtools-protocol": "0.0.1232444"
+    "puppeteer/**/devtools-protocol": "0.0.1299070",
+    "puppeteer-core/**/devtools-protocol": "0.0.1299070"
   },
   "repository": "GoogleChrome/lighthouse",
   "keywords": [

package/third-party/chromium-synchronization/inspector-issueAdded-types-test.js

@@ -51,6 +51,7 @@ Array [
   "propertyRuleIssueDetails",
   "quirksModeIssueDetails",
   "sharedArrayBufferIssueDetails",
+  "sharedDictionaryIssueDetails",
   "stylesheetLoadingIssueDetails",
 ]
 `);

package/types/artifacts.d.ts

@@ -545,6 +545,7 @@ declare module Artifacts {
     quirksModeIssue: Crdp.Audits.QuirksModeIssueDetails[];
     cookieIssue: Crdp.Audits.CookieIssueDetails[];
     sharedArrayBufferIssue: Crdp.Audits.SharedArrayBufferIssueDetails[];
+    sharedDictionaryIssue: Crdp.Audits.SharedDictionaryIssueDetails[];
     stylesheetLoadingIssue: Crdp.Audits.StylesheetLoadingIssueDetails[];
     federatedAuthUserInfoRequestIssue: Crdp.Audits.FederatedAuthUserInfoRequestIssueDetails[];
   }

package/types/gatherer.d.ts

@@ -35,6 +35,7 @@ declare module Gatherer {
     sendCommand<TMethod extends keyof CrdpCommands>(method: TMethod, ...params: CrdpCommands[TMethod]['paramsType']): Promise<CrdpCommands[TMethod]['returnType']>;
     sendCommandAndIgnore<TMethod extends keyof CrdpCommands>(method: TMethod, ...params: CrdpCommands[TMethod]['paramsType']): Promise<void>;
     dispose(): Promise<void>;
+    onCrashPromise(): Promise<never>;
   }
 
   interface Driver {
@@ -49,8 +50,6 @@ declare module Gatherer {
       off(event: 'protocolevent', callback: (payload: Protocol.RawEventMessage) => void): void
     };
     networkMonitor: NetworkMonitor;
-    listenForCrashes: (() => void);
-    fatalRejection: {promise: Promise<never>, rej: (reason: Error) => void}
   }
 
   interface Context<TDependencies extends DependencyKey = DefaultDependenciesKey> {