core(driver): add sendCommandAndIgnore (#15913)

GoogleChrome · Apr 10, 2024 · 7fa8370 · 7fa8370
1 parent 9bd33f8
commit 7fa8370
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/core/gather/driver.js b/core/gather/driver.js
@@ -26,6 +26,7 @@ const throwingSession = {
   once: throwNotConnectedFn,
   off: throwNotConnectedFn,
   sendCommand: throwNotConnectedFn,
+  sendCommandAndIgnore: throwNotConnectedFn,
   dispose: throwNotConnectedFn,
 };
 

diff --git a/core/gather/driver/target-manager.js b/core/gather/driver/target-manager.js
@@ -180,7 +180,7 @@ class TargetManager extends ProtocolEventEmitter {
       throw err;
     } finally {
       // Resume the target if it was paused, but if it's unnecessary, we don't care about the error.
-      await newSession.sendCommand('Runtime.runIfWaitingForDebugger').catch(() => {});
+      await newSession.sendCommandAndIgnore('Runtime.runIfWaitingForDebugger');
     }
   }
 

diff --git a/core/gather/driver/wait-for-condition.js b/core/gather/driver/wait-for-condition.js
@@ -498,9 +498,8 @@ async function waitForFullyLoaded(session, networkMonitor, options) {
       if (await isPageHung(session)) {
         log.warn('waitFor', 'Page appears to be hung, killing JavaScript...');
         // We don't await these, as we want to exit with PAGE_HUNG
-        void session.sendCommand('Emulation.setScriptExecutionDisabled', {value: true})
-          .catch(_ => {});
-        void session.sendCommand('Runtime.terminateExecution').catch(_ => {});
+        void session.sendCommandAndIgnore('Emulation.setScriptExecutionDisabled', {value: true});
+        void session.sendCommandAndIgnore('Runtime.terminateExecution');
         throw new LighthouseError(LighthouseError.errors.PAGE_HUNG);
       }
 

diff --git a/core/gather/session.js b/core/gather/session.js
@@ -120,6 +120,18 @@ class ProtocolSession extends CrdpEventEmitter {
     });
   }
 
+  /**
+   * Send and if there's an error response, do not reject.
+   * @template {keyof LH.CrdpCommands} C
+   * @param {C} method
+   * @param {LH.CrdpCommands[C]['paramsType']} params
+   * @return {Promise<void>}
+   */
+  sendCommandAndIgnore(method, ...params) {
+    return this.sendCommand(method, ...params)
+      .catch(e => log.verbose('session', method, e.message)).then(_ => void 0);
+  }
+
   /**
    * Disposes of a session so that it can no longer talk to Chrome.
    * @return {Promise<void>}

diff --git a/core/test/gather/mock-driver.js b/core/test/gather/mock-driver.js
@@ -24,9 +24,11 @@ import {NetworkMonitor} from '../../gather/driver/network-monitor.js';
 /** @typedef {import('../../gather/driver/execution-context.js')} ExecutionContext */
 
 function createMockSession() {
+  const mockSendCommand = createMockSendCommandFn();
   return {
     setTargetInfo: fnAny(),
-    sendCommand: createMockSendCommandFn(),
+    sendCommand: mockSendCommand,
+    sendCommandAndIgnore: mockSendCommand,
     setNextProtocolTimeout: fnAny(),
     hasNextProtocolTimeout: fnAny(),
     getNextProtocolTimeout: fnAny(),

diff --git a/types/gatherer.d.ts b/types/gatherer.d.ts
@@ -33,6 +33,7 @@ declare module Gatherer {
     once<TEvent extends keyof CrdpEvents>(event: TEvent, callback: (...args: CrdpEvents[TEvent]) => void): void;
     off<TEvent extends keyof CrdpEvents>(event: TEvent, callback: (...args: CrdpEvents[TEvent]) => void): void;
     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>;
   }