lighthouse 9.5.0-dev.20220606 → 9.5.0-dev.20220607

package/dist/report/bundle.esm.js

@@ -5757,6 +5757,30 @@ function renderReport(lhr, opts = {}) {
   return rootEl;
 }
 
-const swapLocale = _ => {}; const format = _ => {};
+/**
+ * Returns a new LHR with all strings changed to the new requestedLocale.
+ * @param {LH.Result} lhr
+ * @param {LH.Locale} requestedLocale
+ * @return {{lhr: LH.Result, missingIcuMessageIds: string[]}}
+ */
+function swapLocale(lhr, requestedLocale) {
+  // Stub function only included for types
+  return {
+    lhr,
+    missingIcuMessageIds: [],
+  };
+}
+
+/**
+ * Populate the i18n string lookup dict with locale data
+ * Used when the host environment selects the locale and serves lighthouse the intended locale file
+ * @see https://docs.google.com/document/d/1jnt3BqKB-4q3AE94UWFA0Gqspx8Sd_jivlB7gQMlmfk/edit
+ * @param {LH.Locale} locale
+ * @param {Record<string, {message: string}>} lhlMessages
+ */
+function registerLocaleData(locale, lhlMessages) {
+  // Stub function only included for types
+}
+const format = {registerLocaleData};
 
 export { DOM, ReportRenderer, ReportUIFeatures, format, renderReport, swapLocale };

package/lighthouse-core/fraggle-rock/gather/session.js

@@ -6,7 +6,6 @@
 'use strict';
 
 const LHError = require('../../lib/lh-error.js');
-const SessionEmitMonkeypatch = Symbol('monkeypatch');
 
 // Controls how long to wait for a response after sending a DevTools protocol command.
 const DEFAULT_PROTOCOL_TIMEOUT = 30000;
@@ -24,22 +23,12 @@ class ProtocolSession {
     this._nextProtocolTimeout = undefined;
     /** @type {WeakMap<any, any>} */
     this._callbackMap = new WeakMap();
+  }
 
-    // FIXME: Monkeypatch puppeteer to be able to listen to *all* protocol events.
-    // This patched method will now emit a copy of every event on `*`.
-    const originalEmit = session.emit;
-    // @ts-expect-error - Test for the monkeypatch.
-    if (originalEmit[SessionEmitMonkeypatch]) return;
-    session.emit = (method, ...args) => {
-      // OOPIF sessions need to emit their sessionId so downstream processors can recognize
-      // the target the event came from.
-      const sessionId = this._targetInfo && this._targetInfo.type === 'iframe' ?
-        this._targetInfo.targetId : undefined;
-      originalEmit.call(session, '*', {method, params: args[0], sessionId});
-      return originalEmit.call(session, method, ...args);
-    };
-    // @ts-expect-error - It's monkeypatching 🤷‍♂️.
-    session.emit[SessionEmitMonkeypatch] = true;
+  sessionId() {
+    return this._targetInfo && this._targetInfo.type === 'iframe' ?
+      this._targetInfo.targetId :
+      undefined;
   }
 
   /** @param {LH.Crdp.Target.TargetInfo} targetInfo */
@@ -110,19 +99,31 @@ class ProtocolSession {
   }
 
   /**
-   * Bind to our custom event that fires for *any* protocol event.
+   * Bind to puppeteer's '*' event that fires for *any* protocol event,
+   * and wrap it with data about the protocol message instead of just the event.
    * @param {(payload: LH.Protocol.RawEventMessage) => void} callback
    */
   addProtocolMessageListener(callback) {
-    this._session.on('*', /** @type {*} */ (callback));
+    /**
+     * @param {any} method
+     * @param {any} event
+     */
+    const listener = (method, event) => callback({
+      method,
+      params: event,
+      sessionId: this.sessionId(),
+    });
+    this._callbackMap.set(callback, listener);
+    this._session.on('*', /** @type {*} */ (listener));
   }
 
   /**
-   * Unbind to our custom event that fires for *any* protocol event.
    * @param {(payload: LH.Protocol.RawEventMessage) => void} callback
    */
   removeProtocolMessageListener(callback) {
-    this._session.off('*', /** @type {*} */ (callback));
+    const listener = this._callbackMap.get(callback);
+    if (!listener) return;
+    this._session.off('*', /** @type {*} */ (listener));
   }
 
   /**

package/lighthouse-core/gather/connections/cri.js

@@ -82,7 +82,8 @@ class CriConnection extends Connection {
    */
   _runJsonCommand(command) {
     return new Promise((resolve, reject) => {
-      const request = http.get({
+      const request = http.request({
+        method: 'PUT', // GET and POST are deprecated: https://crrev.com/c/3595822
         hostname: this.hostname,
         port: this.port,
         path: '/json/' + command,
@@ -109,6 +110,8 @@ class CriConnection extends Connection {
         });
       });
 
+      request.end();
+
       // This error handler is critical to ensuring Lighthouse exits cleanly even when Chrome crashes.
       // See https://github.com/GoogleChrome/lighthouse/pull/8583.
       request.on('error', reject);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lighthouse",
-  "version": "9.5.0-dev.20220606",
+  "version": "9.5.0-dev.20220607",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./lighthouse-core/index.js",
   "bin": {