lighthouse 9.5.0-dev.20230123 → 9.5.0-dev.20230124

package/core/computed/resource-summary.js

@@ -4,11 +4,12 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
+import {EntityClassification} from './entity-classification.js';
 import {makeComputedArtifact} from './computed-artifact.js';
 import {NetworkRecords} from './network-records.js';
 import {NetworkRequest} from '../lib/network-request.js';
 import {Budget} from '../config/budget.js';
-import {Util} from '../util.cjs';
+import {Util} from '../../shared/util.js';
 
 /** @typedef {{count: number, resourceSize: number, transferSize: number}} ResourceEntry */
 
@@ -35,9 +36,10 @@ class ResourceSummary {
    * @param {Array<LH.Artifacts.NetworkRequest>} networkRecords
    * @param {LH.Artifacts.URL} URLArtifact
    * @param {LH.Util.ImmutableObject<LH.Budget[]|null>} budgets
+   * @param {LH.Artifacts.EntityClassification} classifiedEntities
    * @return {Record<LH.Budget.ResourceType, ResourceEntry>}
    */
-  static summarize(networkRecords, URLArtifact, budgets) {
+  static summarize(networkRecords, URLArtifact, budgets, classifiedEntities) {
     /** @type {Record<LH.Budget.ResourceType, ResourceEntry>} */
     const resourceSummary = {
       'stylesheet': {count: 0, resourceSize: 0, transferSize: 0},
@@ -56,8 +58,8 @@ class ResourceSummary {
     if (budget?.options?.firstPartyHostnames) {
       firstPartyHosts = budget.options.firstPartyHostnames;
     } else {
-      const rootDomain = Util.getRootDomain(URLArtifact.finalDisplayedUrl);
-      firstPartyHosts = [`*.${rootDomain}`];
+      firstPartyHosts = classifiedEntities.firstParty?.domains.map(domain => `*.${domain}`) ||
+        [`*.${Util.getRootDomain(URLArtifact.finalDisplayedUrl)}`];
     }
 
     networkRecords.filter(record => {
@@ -105,7 +107,8 @@ class ResourceSummary {
    */
   static async compute_(data, context) {
     const networkRecords = await NetworkRecords.request(data.devtoolsLog, context);
-    return ResourceSummary.summarize(networkRecords, data.URL, data.budgets);
+    const classifiedEntities = await EntityClassification.request(data, context);
+    return ResourceSummary.summarize(networkRecords, data.URL, data.budgets, classifiedEntities);
   }
 }
 

package/core/lib/url-utils.js

@@ -4,7 +4,7 @@
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
 
-import {Util} from '../util.cjs';
+import {Util} from '../../shared/util.js';
 import {LighthouseError} from './lh-error.js';
 
 /** @typedef {import('./network-request.js').NetworkRequest} NetworkRequest */

package/core/runner.d.ts

@@ -16,6 +16,16 @@ export class Runner {
         driverMock?: Driver | undefined;
         computedCache: Map<string, ArbitraryEqualityMap>;
     }): Promise<LH.RunnerResult | undefined>;
+    /**
+     * @param {LH.Artifacts} artifacts
+     * @param {LH.Artifacts.ComputedContext} context
+     */
+    static getEntityClassification(artifacts: LH.Artifacts, context: LH.Artifacts.ComputedContext): Promise<{
+        list: import("../types/lhr/lhr.js").default.LhrEntity[];
+        firstParty: string | undefined;
+        entityIndexByOrigin: Record<string, number>;
+        entityIndexByName: Record<string, number>;
+    } | undefined>;
     /**
      * User can run -G solo, -A solo, or -GA together
      * -G and -A will run partial lighthouse pipelines,

package/core/runner.js

@@ -23,6 +23,8 @@ import {ReportGenerator} from '../report/generator/report-generator.js';
 import {LighthouseError} from './lib/lh-error.js';
 import {lighthouseVersion} from '../root.js';
 import {getModuleDirectory} from '../esm-utils.js';
+import {EntityClassification} from './computed/entity-classification.js';
+import UrlUtils from './lib/url-utils.js';
 
 const moduleDir = getModuleDirectory(import.meta);
 
@@ -110,6 +112,7 @@ class Runner {
         categories,
         categoryGroups: resolvedConfig.groups || undefined,
         stackPacks: stackPacks.getStackPacks(artifacts.Stacks),
+        entities: await Runner.getEntityClassification(artifacts, {computedCache}),
         fullPageScreenshot: resolvedConfig.settings.disableFullPageScreenshot ?
           undefined : artifacts.FullPageScreenshot,
         timing: this._getTiming(artifacts),
@@ -139,6 +142,51 @@ class Runner {
     }
   }
 
+  /**
+   * @param {LH.Artifacts} artifacts
+   * @param {LH.Artifacts.ComputedContext} context
+   */
+  static async getEntityClassification(artifacts, context) {
+    const devtoolsLog = artifacts.devtoolsLogs[Audit.DEFAULT_PASS];
+    if (!devtoolsLog) return;
+    const classifiedEntities = await EntityClassification.request(
+      {URL: artifacts.URL, devtoolsLog}, context);
+
+    /** @type {Array<LH.Result.LhrEntity>} */
+    const entities = [];
+    /** @type {Record<string, number>} */
+    const entityIndexByOrigin = {};
+    /** @type {Record<string, number>} */
+    const entityIndexByName = {};
+
+    for (const [entity, entityUrls] of classifiedEntities.urlsByEntity) {
+      /** @type {LH.Result.LhrEntity} */
+      const shortEntity = {
+        name: entity.name,
+        homepage: entity.homepage,
+      };
+
+      // Reduce payload size in LHR JSON by omitting whats falsy.
+      if (entity === classifiedEntities.firstParty) shortEntity.isFirstParty = true;
+      if (entity.isUnrecognized) shortEntity.isUnrecognized = true;
+
+      const id = entities.push(shortEntity) - 1;
+      for (const url of entityUrls) {
+        const origin = UrlUtils.getOrigin(url);
+        if (!origin) continue;
+        entityIndexByOrigin[origin] = id;
+      }
+      entityIndexByName[shortEntity.name] = id;
+    }
+
+    return {
+      list: entities,
+      firstParty: classifiedEntities.firstParty?.name,
+      entityIndexByOrigin,
+      entityIndexByName,
+    };
+  }
+
   /**
    * User can run -G solo, -A solo, or -GA together
    * -G and -A will run partial lighthouse pipelines,

package/core/util.cjs

@@ -797,7 +797,7 @@ const UIStrings = {
   /** Label for a row in a table that shows the User Agent that was used to send out all network requests during the Lighthouse run. */
   runtimeSettingsUANetwork: 'User agent (network)',
   /** Label for a row in a table that shows the estimated CPU power of the machine running Lighthouse. Example row values: 532, 1492, 783. */
-  runtimeSettingsBenchmark: 'CPU/Memory Power',
+  runtimeSettingsBenchmark: 'Unthrottled CPU/Memory Power',
   /** Label for a row in a table that shows the version of the Axe library used. Example row values: 2.1.0, 3.2.3 */
   runtimeSettingsAxeVersion: 'Axe version',
   /** Label for a row in a table that shows the screen resolution and DPR that was emulated for the Lighthouse run. Example values: '800x600, DPR: 3' */