lighthouse 12.0.0-dev.20240522 → 12.0.0-dev.20240524

package/cli/test/smokehouse/smokehouse.js

@@ -163,8 +163,18 @@ async function runSmokeTest(smokeTestDefn, testOptions) {
 
     // Run Lighthouse.
     try {
+      // Each individual runner has internal timeouts, but we've had bugs where
+      // that didn't cover some edge case. So to be safe give a (long) timeout here.
+      const timeoutPromise = new Promise((_, reject) => {
+        setTimeout(() =>
+          reject(new Error('Timed out waiting for provided lighthouseRunner')), 1000 * 120);
+      });
+      const timedResult = await Promise.race([
+        lighthouseRunner(requestedUrl, config, testRunnerOptions),
+        timeoutPromise,
+      ]);
       result = {
-        ...await lighthouseRunner(requestedUrl, config, testRunnerOptions),
+        ...timedResult,
         networkRequests: takeNetworkRequestUrls ? takeNetworkRequestUrls() : undefined,
       };
 

package/core/computed/metrics/interactive.d.ts

@@ -1,6 +1,12 @@
 export { InteractiveComputed as Interactive };
 export type TimePeriod = {
+    /**
+     * In ms.
+     */
     start: number;
+    /**
+     * In ms.
+     */
     end: number;
 };
 declare const InteractiveComputed: typeof Interactive & {

package/core/computed/metrics/interactive.js

@@ -187,6 +187,6 @@ export {InteractiveComputed as Interactive};
 
 /**
  * @typedef TimePeriod
- * @property {number} start
- * @property {number} end
+ * @property {number} start In ms.
+ * @property {number} end In ms.
  */

package/core/gather/driver/network-monitor.d.ts

@@ -8,9 +8,10 @@ export class NetworkMonitor extends NetworkMonitor_base {
     /**
      * Finds all time periods where the number of inflight requests is less than or equal to the
      * number of allowed concurrent requests.
+     * The time periods returned are in ms.
      * @param {Array<LH.Artifacts.NetworkRequest>} requests
      * @param {number} allowedConcurrentRequests
-     * @param {number=} endTime
+     * @param {number=} endTime In ms
      * @return {Array<{start: number, end: number}>}
      */
     static findNetworkQuietPeriods(requests: Array<LH.Artifacts.NetworkRequest>, allowedConcurrentRequests: number, endTime?: number | undefined): Array<{

package/core/gather/driver/network-monitor.js

@@ -202,9 +202,10 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
   /**
    * Finds all time periods where the number of inflight requests is less than or equal to the
    * number of allowed concurrent requests.
+   * The time periods returned are in ms.
    * @param {Array<LH.Artifacts.NetworkRequest>} requests
    * @param {number} allowedConcurrentRequests
-   * @param {number=} endTime
+   * @param {number=} endTime In ms
    * @return {Array<{start: number, end: number}>}
    */
   static findNetworkQuietPeriods(requests, allowedConcurrentRequests, endTime = Infinity) {
@@ -215,10 +216,9 @@ class NetworkMonitor extends NetworkMonitorEventEmitter {
       if (UrlUtils.isNonNetworkProtocol(request.protocol)) return;
       if (request.protocol === 'ws' || request.protocol === 'wss') return;
 
-      // convert the network timestamp to ms
-      timeBoundaries.push({time: request.networkRequestTime * 1000, isStart: true});
+      timeBoundaries.push({time: request.networkRequestTime, isStart: true});
       if (request.finished) {
-        timeBoundaries.push({time: request.networkEndTime * 1000, isStart: false});
+        timeBoundaries.push({time: request.networkEndTime, isStart: false});
       }
     });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lighthouse",
   "type": "module",
-  "version": "12.0.0-dev.20240522",
+  "version": "12.0.0-dev.20240524",
   "description": "Automated auditing, performance metrics, and best practices for the web.",
   "main": "./core/index.js",
   "bin": {