lighthouse 11.1.0-dev.20230910 → 11.1.0-dev.20230912

package/core/computed/page-dependency-graph.js

@@ -78,6 +78,7 @@ class PageDependencyGraph {
 
     networkRecords.forEach(record => {
       if (IGNORED_MIME_TYPES_REGEX.test(record.mimeType)) return;
+      if (record.sessionTargetType === 'worker') return;
 
       // Network record requestIds can be duplicated for an unknown reason
       // Suffix all subsequent records with `:duplicate` until it's unique

package/core/gather/driver/target-manager.d.ts

@@ -49,6 +49,11 @@ export class TargetManager extends TargetManager_base {
      * @return {LH.Gatherer.ProtocolSession}
      */
     _findSession(sessionId: string): LH.Gatherer.ProtocolSession;
+    /**
+     * @param {string} targetType
+     * @return {targetType is LH.Protocol.TargetType}
+     */
+    _isAcceptedTargetType(targetType: string): targetType is import("../../../types/protocol.js").default.TargetType;
     /**
      * Returns the root session.
      * @return {LH.Gatherer.ProtocolSession}

package/core/gather/driver/target-manager.js

@@ -94,6 +94,16 @@ class TargetManager extends ProtocolEventEmitter {
     throw new Error(`session ${sessionId} not found`);
   }
 
+  /**
+   * @param {string} targetType
+   * @return {targetType is LH.Protocol.TargetType}
+   */
+  _isAcceptedTargetType(targetType) {
+    return targetType === 'page' ||
+      targetType === 'iframe' ||
+      targetType === 'worker';
+  }
+
   /**
    * Returns the root session.
    * @return {LH.Gatherer.ProtocolSession}
@@ -116,19 +126,19 @@ class TargetManager extends ProtocolEventEmitter {
     const newSession = new ProtocolSession(cdpSession);
 
     try {
-      const target = await newSession.sendCommand('Target.getTargetInfo').catch(() => null);
-      const targetType = target?.targetInfo?.type;
-      const hasValidTargetType = targetType === 'page' || targetType === 'iframe';
+      const {targetInfo} = await newSession.sendCommand('Target.getTargetInfo');
+      const targetType = targetInfo.type;
+
       // TODO: should detach from target in this case?
       // See pptr: https://github.com/puppeteer/puppeteer/blob/733cbecf487c71483bee8350e37030edb24bc021/src/common/Page.ts#L495-L526
-      if (!target || !hasValidTargetType) return;
+      if (!this._isAcceptedTargetType(targetType)) return;
 
       // No need to continue if target has already been seen.
-      const targetId = target.targetInfo.targetId;
+      const targetId = targetInfo.targetId;
       if (this._targetIdToTargets.has(targetId)) return;
 
-      newSession.setTargetInfo(target.targetInfo);
-      const targetName = target.targetInfo.url || target.targetInfo.targetId;
+      newSession.setTargetInfo(targetInfo);
+      const targetName = targetInfo.url || targetInfo.targetId;
       log.verbose('target-manager', `target ${targetName} attached`);
 
       const trueProtocolListener = this._getProtocolEventListener(targetType, newSession.id());
@@ -139,7 +149,7 @@ class TargetManager extends ProtocolEventEmitter {
       cdpSession.on('sessionattached', this._onSessionAttached);
 
       const targetWithSession = {
-        target: target.targetInfo,
+        target: targetInfo,
         cdpSession,
         session: newSession,
         protocolListener,

package/core/gather/gatherers/dobetterweb/optimized-images.js

@@ -54,8 +54,8 @@ class OptimizedImages extends BaseGatherer {
     /** @type {Set<string>} */
     const seenUrls = new Set();
     return networkRecords.reduce((prev, record) => {
-      // Skip records that we've seen before, never finished, or came from OOPIFs.
-      if (seenUrls.has(record.url) || !record.finished || record.isOutOfProcessIframe) {
+      // Skip records that we've seen before, never finished, or came from OOPIFs/web workers.
+      if (seenUrls.has(record.url) || !record.finished || record.sessionTargetType !== 'page') {
         return prev;
       }
 

package/core/gather/gatherers/dobetterweb/response-compression.js

@@ -56,7 +56,7 @@ class ResponseCompression extends BaseGatherer {
     const unoptimizedResponses = [];
 
     networkRecords.forEach(record => {
-      if (record.isOutOfProcessIframe) return;
+      if (record.sessionTargetType !== 'page') return;
 
       const mimeType = record.mimeType;
       const resourceType = record.resourceType || NetworkRequest.TYPES.Other;

package/core/gather/gatherers/script-elements.js

@@ -65,7 +65,7 @@ class ScriptElements extends BaseGatherer {
 
     const scriptRecords = networkRecords
       .filter(record => record.resourceType === NetworkRequest.TYPES.Script)
-      .filter(record => !record.isOutOfProcessIframe);
+      .filter(record => record.sessionTargetType === 'page');
 
     for (let i = 0; i < scriptRecords.length; i++) {
       const record = scriptRecords[i];

package/package.json

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