chrome-devtools-frontend 1.0.970539 → 1.0.972865

package/front_end/core/sdk/NetworkManager.ts

@@ -412,6 +412,16 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
      * once it is created in `requestWillBeSent`.
      */
     this.#requestIdToTrustTokenEvent = new Map();
+
+    MultitargetNetworkManager.instance().addEventListener(
+        MultitargetNetworkManager.Events.RequestIntercepted, this.#markAsIntercepted.bind(this));
+  }
+
+  #markAsIntercepted(event: Common.EventTarget.EventTargetEvent<string>): void {
+    const request = this.requestForURL(event.data);
+    if (request) {
+      request.setWasIntercepted(true);
+    }
   }
 
   private headersMapToHeadersArray(headersMap: Protocol.Network.Headers): NameValue[] {
@@ -437,7 +447,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   private updateNetworkRequestWithResponse(networkRequest: NetworkRequest, response: Protocol.Network.Response): void {
     if (response.url && networkRequest.url() !== response.url) {
-      networkRequest.setUrl(response.url);
+      networkRequest.setUrl(response.url as Platform.DevToolsPath.UrlString);
     }
     networkRequest.mimeType = (response.mimeType as MIME_TYPE);
     if (!networkRequest.statusCode) {
@@ -446,7 +456,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     if (!networkRequest.statusText) {
       networkRequest.statusText = response.statusText;
     }
-    if (!networkRequest.hasExtraResponseInfo()) {
+    if (!networkRequest.hasExtraResponseInfo() || networkRequest.wasIntercepted()) {
       networkRequest.responseHeaders = this.headersMapToHeadersArray(response.headers);
     }
 
@@ -578,10 +588,12 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
           frameId,
         });
       }
-      networkRequest = this.appendRedirect(requestId, timestamp, request.url);
+      networkRequest = this.appendRedirect(requestId, timestamp, request.url as Platform.DevToolsPath.UrlString);
       this.#manager.dispatchEventToListeners(Events.RequestRedirected, networkRequest);
     } else {
-      networkRequest = NetworkRequest.create(requestId, request.url, documentURL, frameId ?? null, loaderId, initiator);
+      networkRequest = NetworkRequest.create(
+          requestId, request.url as Platform.DevToolsPath.UrlString, documentURL as Platform.DevToolsPath.UrlString,
+          frameId ?? null, loaderId, initiator);
       requestToManagerMap.set(networkRequest, this.#manager);
     }
     networkRequest.hasNetworkData = true;
@@ -620,7 +632,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
       const lastModifiedHeader = lowercaseHeaders['last-modified'];
       // We missed the requestWillBeSent.
       const eventData: RequestUpdateDroppedEventData = {
-        url: response.url,
+        url: response.url as Platform.DevToolsPath.UrlString,
         frameId: frameId ?? null,
         loaderId: loaderId,
         resourceType: type,
@@ -706,7 +718,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   }
 
   webSocketCreated({requestId, url: requestURL, initiator}: Protocol.Network.WebSocketCreatedEvent): void {
-    const networkRequest = NetworkRequest.createForWebSocket(requestId, requestURL, initiator);
+    const networkRequest =
+        NetworkRequest.createForWebSocket(requestId, requestURL as Platform.DevToolsPath.UrlString, initiator);
     requestToManagerMap.set(networkRequest, this.#manager);
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.WebSocket);
     this.startNetworkRequest(networkRequest, null);
@@ -855,7 +868,9 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
     return builder;
   }
 
-  private appendRedirect(requestId: Protocol.Network.RequestId, time: number, redirectURL: string): NetworkRequest {
+  private appendRedirect(
+      requestId: Protocol.Network.RequestId, time: number,
+      redirectURL: Platform.DevToolsPath.UrlString): NetworkRequest {
     const originalNetworkRequest = this.#requestsById.get(requestId);
     if (!originalNetworkRequest) {
       throw new Error(`Could not find original network request for ${requestId}`);
@@ -958,7 +973,8 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
 
   webTransportCreated({transportId, url: requestURL, timestamp: time, initiator}:
                           Protocol.Network.WebTransportCreatedEvent): void {
-    const networkRequest = NetworkRequest.createForWebSocket(transportId, requestURL, initiator);
+    const networkRequest =
+        NetworkRequest.createForWebSocket(transportId, requestURL as Platform.DevToolsPath.UrlString, initiator);
     networkRequest.hasNetworkData = true;
     requestToManagerMap.set(networkRequest, this.#manager);
     networkRequest.setResourceType(Common.ResourceType.resourceTypes.WebTransport);
@@ -1061,7 +1077,9 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher {
   private createNetworkRequest(
       requestId: Protocol.Network.RequestId, frameId: Protocol.Page.FrameId, loaderId: Protocol.Network.LoaderId,
       url: string, documentURL: string, initiator: Protocol.Network.Initiator|null): NetworkRequest {
-    const request = NetworkRequest.create(requestId, url, documentURL, frameId, loaderId, initiator);
+    const request = NetworkRequest.create(
+        requestId, url as Platform.DevToolsPath.UrlString, documentURL as Platform.DevToolsPath.UrlString, frameId,
+        loaderId, initiator);
     requestToManagerMap.set(request, this.#manager);
     return request;
   }
@@ -1401,6 +1419,8 @@ export class MultitargetNetworkManager extends Common.ObjectWrapper.ObjectWrappe
     for (const requestInterceptor of this.#urlsForRequestInterceptor.keysArray()) {
       await requestInterceptor(interceptedRequest);
       if (interceptedRequest.hasResponded()) {
+        this.dispatchEventToListeners(
+            MultitargetNetworkManager.Events.RequestIntercepted, interceptedRequest.request.url);
         return;
       }
     }
@@ -1467,6 +1487,7 @@ export namespace MultitargetNetworkManager {
     UserAgentChanged = 'UserAgentChanged',
     InterceptorsChanged = 'InterceptorsChanged',
     AcceptedEncodingsChanged = 'AcceptedEncodingsChanged',
+    RequestIntercepted = 'RequestIntercepted',
   }
 
   export type EventTypes = {
@@ -1475,6 +1496,7 @@ export namespace MultitargetNetworkManager {
     [Events.UserAgentChanged]: void,
     [Events.InterceptorsChanged]: void,
     [Events.AcceptedEncodingsChanged]: void,
+    [Events.RequestIntercepted]: string,
   };
 }
 
@@ -1709,7 +1731,7 @@ export interface InterceptionPattern {
 export type RequestInterceptor = (request: InterceptedRequest) => Promise<void>;
 
 export interface RequestUpdateDroppedEventData {
-  url: string;
+  url: Platform.DevToolsPath.UrlString;
   frameId: Protocol.Page.FrameId|null;
   loaderId: Protocol.Network.LoaderId;
   resourceType: Protocol.Network.ResourceType;

package/front_end/core/sdk/NetworkRequest.ts

@@ -204,7 +204,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     TextUtils.ContentProvider.ContentProvider {
   #requestIdInternal: string;
   #backendRequestIdInternal?: Protocol.Network.RequestId;
-  readonly #documentURLInternal: string;
+  readonly #documentURLInternal: Platform.DevToolsPath.UrlString;
   readonly #frameIdInternal: Protocol.Page.FrameId|null;
   readonly #loaderIdInternal: Protocol.Network.LoaderId|null;
   readonly #initiatorInternal: Protocol.Network.Initiator|null|undefined;
@@ -257,7 +257,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   #includedRequestCookiesInternal: Cookie[];
   #blockedResponseCookiesInternal: BlockedSetCookieWithReason[];
   localizedFailDescription: string|null;
-  #urlInternal!: string;
+  #urlInternal!: Platform.DevToolsPath.UrlString;
   #responseReceivedTimeInternal!: number;
   #transferSizeInternal!: number;
   #finishedInternal!: boolean;
@@ -290,11 +290,12 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
   #parsedQueryParameters?: NameValue[];
   #contentDataProvider?: (() => Promise<ContentData>);
   #isSameSiteInternal: boolean|null;
+  #wasIntercepted: boolean;
 
   private constructor(
-      requestId: string, backendRequestId: Protocol.Network.RequestId|undefined, url: string, documentURL: string,
-      frameId: Protocol.Page.FrameId|null, loaderId: Protocol.Network.LoaderId|null,
-      initiator: Protocol.Network.Initiator|null) {
+      requestId: string, backendRequestId: Protocol.Network.RequestId|undefined, url: Platform.DevToolsPath.UrlString,
+      documentURL: Platform.DevToolsPath.UrlString, frameId: Protocol.Page.FrameId|null,
+      loaderId: Protocol.Network.LoaderId|null, initiator: Protocol.Network.Initiator|null) {
     super();
 
     this.#requestIdInternal = requestId;
@@ -363,23 +364,28 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
 
     this.localizedFailDescription = null;
     this.#isSameSiteInternal = null;
+
+    this.#wasIntercepted = false;
   }
 
   static create(
-      backendRequestId: Protocol.Network.RequestId, url: string, documentURL: string,
-      frameId: Protocol.Page.FrameId|null, loaderId: Protocol.Network.LoaderId|null,
-      initiator: Protocol.Network.Initiator|null): NetworkRequest {
+      backendRequestId: Protocol.Network.RequestId, url: Platform.DevToolsPath.UrlString,
+      documentURL: Platform.DevToolsPath.UrlString, frameId: Protocol.Page.FrameId|null,
+      loaderId: Protocol.Network.LoaderId|null, initiator: Protocol.Network.Initiator|null): NetworkRequest {
     return new NetworkRequest(backendRequestId, backendRequestId, url, documentURL, frameId, loaderId, initiator);
   }
 
   static createForWebSocket(
-      backendRequestId: Protocol.Network.RequestId, requestURL: string,
+      backendRequestId: Protocol.Network.RequestId, requestURL: Platform.DevToolsPath.UrlString,
       initiator?: Protocol.Network.Initiator): NetworkRequest {
-    return new NetworkRequest(backendRequestId, backendRequestId, requestURL, '', null, null, initiator || null);
+    return new NetworkRequest(
+        backendRequestId, backendRequestId, requestURL, '' as Platform.DevToolsPath.UrlString, null, null,
+        initiator || null);
   }
 
   static createWithoutBackendRequest(
-      requestId: string, url: string, documentURL: string, initiator: Protocol.Network.Initiator|null): NetworkRequest {
+      requestId: string, url: Platform.DevToolsPath.UrlString, documentURL: Platform.DevToolsPath.UrlString,
+      initiator: Protocol.Network.Initiator|null): NetworkRequest {
     return new NetworkRequest(requestId, undefined, url, documentURL, null, null, initiator);
   }
 
@@ -403,7 +409,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     return this.#backendRequestIdInternal;
   }
 
-  url(): string {
+  url(): Platform.DevToolsPath.UrlString {
     return this.#urlInternal;
   }
 
@@ -411,7 +417,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     return this.#urlInternal.startsWith('blob:');
   }
 
-  setUrl(x: string): void {
+  setUrl(x: Platform.DevToolsPath.UrlString): void {
     if (this.#urlInternal === x) {
       return;
     }
@@ -424,7 +430,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.#pathInternal = undefined;
   }
 
-  get documentURL(): string {
+  get documentURL(): Platform.DevToolsPath.UrlString {
     return this.#documentURLInternal;
   }
 
@@ -964,6 +970,14 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     return this.#responseHeaderValues[headerName];
   }
 
+  wasIntercepted(): boolean {
+    return this.#wasIntercepted;
+  }
+
+  setWasIntercepted(wasIntercepted: boolean): void {
+    this.#wasIntercepted = wasIntercepted;
+  }
+
   get responseCookies(): Cookie[] {
     if (!this.#responseCookiesInternal) {
       this.#responseCookiesInternal =
@@ -1175,8 +1189,7 @@ export class NetworkRequest extends Common.ObjectWrapper.ObjectWrapper<EventType
     this.#contentDataProvider = dataProvider;
   }
 
-  // TODO(crbug.com/1253323): Cast to RawPathString will be removed when migration to branded types is complete.
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     return this.#urlInternal;
   }
 

package/front_end/core/sdk/Resource.ts

@@ -42,8 +42,8 @@ import type {ResourceTreeFrame, ResourceTreeModel} from './ResourceTreeModel.js'
 export class Resource implements TextUtils.ContentProvider.ContentProvider {
   readonly #resourceTreeModel: ResourceTreeModel;
   #requestInternal: NetworkRequest|null;
-  #urlInternal!: string;
-  readonly #documentURLInternal: string;
+  #urlInternal!: Platform.DevToolsPath.UrlString;
+  readonly #documentURLInternal: Platform.DevToolsPath.UrlString;
   readonly #frameIdInternal: Protocol.Page.FrameId|null;
   readonly #loaderIdInternal: Protocol.Network.LoaderId|null;
   readonly #type: Common.ResourceType.ResourceType;
@@ -58,9 +58,10 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
   #contentRequested?: boolean;
 
   constructor(
-      resourceTreeModel: ResourceTreeModel, request: NetworkRequest|null, url: string, documentURL: string,
-      frameId: Protocol.Page.FrameId|null, loaderId: Protocol.Network.LoaderId|null,
-      type: Common.ResourceType.ResourceType, mimeType: string, lastModified: Date|null, contentSize: number|null) {
+      resourceTreeModel: ResourceTreeModel, request: NetworkRequest|null, url: Platform.DevToolsPath.UrlString,
+      documentURL: Platform.DevToolsPath.UrlString, frameId: Protocol.Page.FrameId|null,
+      loaderId: Protocol.Network.LoaderId|null, type: Common.ResourceType.ResourceType, mimeType: string,
+      lastModified: Date|null, contentSize: number|null) {
     this.#resourceTreeModel = resourceTreeModel;
     this.#requestInternal = request;
     this.url = url;
@@ -101,11 +102,11 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
     return this.#requestInternal;
   }
 
-  get url(): string {
+  get url(): Platform.DevToolsPath.UrlString {
     return this.#urlInternal;
   }
 
-  set url(x: string) {
+  set url(x: Platform.DevToolsPath.UrlString) {
     this.#urlInternal = x;
     this.#parsedURLInternal = new Common.ParsedURL.ParsedURL(x);
   }
@@ -114,7 +115,7 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
     return this.#parsedURLInternal;
   }
 
-  get documentURL(): string {
+  get documentURL(): Platform.DevToolsPath.UrlString {
     return this.#documentURLInternal;
   }
 
@@ -150,8 +151,7 @@ export class Resource implements TextUtils.ContentProvider.ContentProvider {
     this.#isGeneratedInternal = val;
   }
 
-  // TODO(crbug.com/1253323): Cast to RawPathString will be removed when migration to branded types is complete.
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     return this.#urlInternal;
   }
 

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -34,6 +34,7 @@
 
 import * as Common from '../common/common.js';
 import * as i18n from '../i18n/i18n.js';
+import type * as Platform from '../platform/platform.js';
 import type * as ProtocolProxyApi from '../../generated/protocol-proxy-api.js';
 import * as Protocol from '../../generated/protocol.js';
 
@@ -237,8 +238,8 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     const frame = this.framesInternal.get(framePayload.id);
     if (frame && !frame.getResourcesMap().get(framePayload.url)) {
       const frameResource = this.createResourceFromFramePayload(
-          framePayload, framePayload.url, Common.ResourceType.resourceTypes.Document, framePayload.mimeType, null,
-          null);
+          framePayload, framePayload.url as Platform.DevToolsPath.UrlString, Common.ResourceType.resourceTypes.Document,
+          framePayload.mimeType, null, null);
       frameResource.isGenerated = true;
       frame.addResource(frameResource);
     }
@@ -342,25 +343,27 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     for (let i = 0; i < frameTreePayload.resources.length; ++i) {
       const subresource = frameTreePayload.resources[i];
       const resource = this.createResourceFromFramePayload(
-          framePayload, subresource.url, Common.ResourceType.resourceTypes[subresource.type], subresource.mimeType,
-          subresource.lastModified || null, subresource.contentSize || null);
+          framePayload, subresource.url as Platform.DevToolsPath.UrlString,
+          Common.ResourceType.resourceTypes[subresource.type], subresource.mimeType, subresource.lastModified || null,
+          subresource.contentSize || null);
       frame.addResource(resource);
     }
 
     if (!frame.getResourcesMap().get(framePayload.url)) {
       const frameResource = this.createResourceFromFramePayload(
-          framePayload, framePayload.url, Common.ResourceType.resourceTypes.Document, framePayload.mimeType, null,
-          null);
+          framePayload, framePayload.url as Platform.DevToolsPath.UrlString, Common.ResourceType.resourceTypes.Document,
+          framePayload.mimeType, null, null);
       frame.addResource(frameResource);
     }
   }
 
   private createResourceFromFramePayload(
-      frame: Protocol.Page.Frame, url: string, type: Common.ResourceType.ResourceType, mimeType: string,
-      lastModifiedTime: number|null, contentSize: number|null): Resource {
+      frame: Protocol.Page.Frame, url: Platform.DevToolsPath.UrlString, type: Common.ResourceType.ResourceType,
+      mimeType: string, lastModifiedTime: number|null, contentSize: number|null): Resource {
     const lastModified = typeof lastModifiedTime === 'number' ? new Date(lastModifiedTime * 1000) : null;
     return new Resource(
-        this, null, url, frame.url, frame.id, frame.loaderId, type, mimeType, lastModified, contentSize);
+        this, null, url, frame.url as Platform.DevToolsPath.UrlString, frame.id, frame.loaderId, type, mimeType,
+        lastModified, contentSize);
   }
 
   suspendReload(): void {
@@ -601,7 +604,7 @@ export class ResourceTreeFrame {
   crossTargetParentFrameId: string|null;
   #loaderIdInternal: string;
   #nameInternal: string|null|undefined;
-  #urlInternal: string;
+  #urlInternal: Platform.DevToolsPath.UrlString;
   #domainAndRegistryInternal: string;
   #securityOriginInternal: string|null;
   #unreachableUrlInternal: string;
@@ -633,7 +636,7 @@ export class ResourceTreeFrame {
 
     this.#loaderIdInternal = (payload && payload.loaderId) || '';
     this.#nameInternal = payload && payload.name;
-    this.#urlInternal = (payload && payload.url) || '';
+    this.#urlInternal = ((payload && payload.url) || '') as Platform.DevToolsPath.UrlString;
     this.#domainAndRegistryInternal = (payload && payload.domainAndRegistry) || '';
     this.#securityOriginInternal = payload && payload.securityOrigin;
     this.#unreachableUrlInternal = (payload && payload.unreachableUrl) || '';
@@ -685,7 +688,7 @@ export class ResourceTreeFrame {
   navigate(framePayload: Protocol.Page.Frame): void {
     this.#loaderIdInternal = framePayload.loaderId;
     this.#nameInternal = framePayload.name;
-    this.#urlInternal = framePayload.url;
+    this.#urlInternal = framePayload.url as Platform.DevToolsPath.UrlString;
     this.#domainAndRegistryInternal = framePayload.domainAndRegistry;
     this.#securityOriginInternal = framePayload.securityOrigin;
     this.#unreachableUrlInternal = framePayload.unreachableUrl || '';
@@ -719,7 +722,7 @@ export class ResourceTreeFrame {
     return this.#nameInternal || '';
   }
 
-  get url(): string {
+  get url(): Platform.DevToolsPath.UrlString {
     return this.#urlInternal;
   }
 

package/front_end/core/sdk/Script.ts

@@ -29,6 +29,7 @@
 
 import * as Protocol from '../../generated/protocol.js';
 import * as TextUtils from '../../models/text_utils/text_utils.js';
+import type * as Platform from '../../core/platform/platform.js';
 import * as Common from '../common/common.js';
 import * as i18n from '../i18n/i18n.js';
 
@@ -56,7 +57,7 @@ const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 export class Script implements TextUtils.ContentProvider.ContentProvider, FrameAssociated {
   debuggerModel: DebuggerModel;
   scriptId: Protocol.Runtime.ScriptId;
-  sourceURL: string;
+  sourceURL: Platform.DevToolsPath.UrlString;
   lineOffset: number;
   columnOffset: number;
   endLine: number;
@@ -65,7 +66,7 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
   hash: string;
   readonly #isContentScriptInternal: boolean;
   readonly #isLiveEditInternal: boolean;
-  sourceMapURL: string|undefined;
+  sourceMapURL: Platform.DevToolsPath.UrlString|undefined;
   debugSymbols: Protocol.Debugger.DebugSymbols|null;
   hasSourceURL: boolean;
   contentLength: number;
@@ -77,12 +78,12 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
   readonly #embedderNameInternal: string|null;
   readonly isModule: boolean|null;
   constructor(
-      debuggerModel: DebuggerModel, scriptId: Protocol.Runtime.ScriptId, sourceURL: string, startLine: number,
-      startColumn: number, endLine: number, endColumn: number, executionContextId: number, hash: string,
-      isContentScript: boolean, isLiveEdit: boolean, sourceMapURL: string|undefined, hasSourceURL: boolean,
-      length: number, isModule: boolean|null, originStackTrace: Protocol.Runtime.StackTrace|null,
-      codeOffset: number|null, scriptLanguage: string|null, debugSymbols: Protocol.Debugger.DebugSymbols|null,
-      embedderName: string|null) {
+      debuggerModel: DebuggerModel, scriptId: Protocol.Runtime.ScriptId, sourceURL: Platform.DevToolsPath.UrlString,
+      startLine: number, startColumn: number, endLine: number, endColumn: number, executionContextId: number,
+      hash: string, isContentScript: boolean, isLiveEdit: boolean,
+      sourceMapURL: Platform.DevToolsPath.UrlString|undefined, hasSourceURL: boolean, length: number,
+      isModule: boolean|null, originStackTrace: Protocol.Runtime.StackTrace|null, codeOffset: number|null,
+      scriptLanguage: string|null, debugSymbols: Protocol.Debugger.DebugSymbols|null, embedderName: string|null) {
     this.debuggerModel = debuggerModel;
     this.scriptId = scriptId;
     this.sourceURL = sourceURL;
@@ -163,8 +164,7 @@ export class Script implements TextUtils.ContentProvider.ContentProvider, FrameA
     return this.#isLiveEditInternal;
   }
 
-  // TODO(crbug.com/1253323): Cast to RawPathString will be removed when migration to branded types is complete.
-  contentURL(): string {
+  contentURL(): Platform.DevToolsPath.UrlString {
     return this.sourceURL;
   }
 

package/front_end/core/sdk/SourceMap.ts

@@ -32,6 +32,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// TODO(crbug.com/1253323): Casts to UrlString will be removed from this file when migration to branded types is complete.
+
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Common from '../common/common.js';
 import * as i18n from '../i18n/i18n.js';
@@ -143,7 +145,7 @@ export class TextSourceMap implements SourceMap {
   readonly #sourceMappingURL: string;
   readonly #baseURL: string;
   #mappingsInternal: SourceMapEntry[]|null;
-  readonly #sourceInfos: Map<string, TextSourceMap.SourceInfo>;
+  readonly #sourceInfos: Map<Platform.DevToolsPath.UrlString, TextSourceMap.SourceInfo>;
 
   /**
    * Implements Source Map V3 model. See https://github.com/google/closure-compiler/wiki/Source-Maps
@@ -201,11 +203,11 @@ export class TextSourceMap implements SourceMap {
     return this.#sourceMappingURL;
   }
 
-  sourceURLs(): string[] {
+  sourceURLs(): Platform.DevToolsPath.UrlString[] {
     return [...this.#sourceInfos.keys()];
   }
 
-  sourceContentProvider(sourceURL: string, contentType: Common.ResourceType.ResourceType):
+  sourceContentProvider(sourceURL: Platform.DevToolsPath.UrlString, contentType: Common.ResourceType.ResourceType):
       TextUtils.ContentProvider.ContentProvider {
     const info = this.#sourceInfos.get(sourceURL);
     if (info && info.content) {
@@ -215,7 +217,7 @@ export class TextSourceMap implements SourceMap {
   }
 
   embeddedContentByURL(sourceURL: string): string|null {
-    const entry = this.#sourceInfos.get(sourceURL);
+    const entry = this.#sourceInfos.get(sourceURL as Platform.DevToolsPath.UrlString);
     if (!entry) {
       return null;
     }
@@ -307,7 +309,7 @@ export class TextSourceMap implements SourceMap {
   }
 
   private reversedMappings(sourceURL: string): number[] {
-    const info = this.#sourceInfos.get(sourceURL);
+    const info = this.#sourceInfos.get(sourceURL as Platform.DevToolsPath.UrlString);
     if (!info) {
       return [];
     }
@@ -371,7 +373,7 @@ export class TextSourceMap implements SourceMap {
       if (url === this.#compiledURLInternal && source) {
         url += '? [sm]';
       }
-      this.#sourceInfos.set(url, new TextSourceMap.SourceInfo(source || null, null));
+      this.#sourceInfos.set(url as Platform.DevToolsPath.UrlString, new TextSourceMap.SourceInfo(source || null, null));
       sourcesList.push(url);
     }
     sourceMapToSourceList.set(sourceMap, sourcesList);

package/front_end/entrypoints/lighthouse_worker/LighthouseService.ts

@@ -75,6 +75,7 @@ class ConnectionProxy implements SDK.Connections.ParallelConnectionInterface {
 
 const port = new LighthousePort();
 let rawConnection: ConnectionProxy|undefined;
+let endTimespan: (() => unknown)|undefined;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function start(method: string, params: any): Promise<unknown> {
@@ -92,6 +93,17 @@ async function start(method: string, params: any): Promise<unknown> {
       undefined;
 
   try {
+    // For timespan we only need to perform setup on startTimespan.
+    // Config, flags, locale, etc. should be stored in the closure of endTimespan.
+    if (method === 'endTimespan') {
+      if (!endTimespan) {
+        throw new Error('Cannot end a timespan before starting one');
+      }
+      const result = await endTimespan();
+      endTimespan = undefined;
+      return result;
+    }
+
     const locale = await fetchLocaleData(params.locales);
     const flags = params.flags;
     flags.logLevel = flags.logLevel || 'info';
@@ -103,7 +115,7 @@ async function start(method: string, params: any): Promise<unknown> {
     const url = params.url;
 
     // Handle legacy Lighthouse runner path.
-    if (method === 'start') {
+    if (method === 'navigation' && flags.legacyNavigation) {
       // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
       const connection = self.setUpWorkerConnection(port);
       // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
@@ -112,17 +124,23 @@ async function start(method: string, params: any): Promise<unknown> {
 
     const {mainTargetId, mainFrameId, mainSessionId} = params.target;
     rawConnection = new ConnectionProxy(mainSessionId);
-    puppeteerConnection =
+    const {page} = puppeteerConnection =
         await Puppeteer.PuppeteerConnection.getPuppeteerConnection(rawConnection, mainFrameId, mainTargetId);
 
-    // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
-    const result = await self.runLighthouseNavigation({
-      url,
-      config,
-      page: puppeteerConnection.page,
-    });
+    if (method === 'snapshot') {
+      // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
+      return await self.runLighthouseSnapshot({config, page});
+    }
 
-    return result;
+    if (method === 'startTimespan') {
+      // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
+      const timespan = await self.startLighthouseTimespan({config, page});
+      endTimespan = timespan.endTimespan;
+      return;
+    }
+
+    // @ts-expect-error https://github.com/GoogleChrome/lighthouse/issues/11628
+    return await self.runLighthouseNavigation(url, {config, page});
   } catch (err) {
     return ({
       fatal: true,
@@ -130,7 +148,10 @@ async function start(method: string, params: any): Promise<unknown> {
       stack: err.stack,
     });
   } finally {
-    puppeteerConnection?.browser.disconnect();
+    // endTimespan will need to use the same connection as startTimespan.
+    if (method !== 'startTimespan') {
+      puppeteerConnection?.browser.disconnect();
+    }
   }
 }
 
@@ -179,8 +200,10 @@ function notifyFrontendViaWorkerMessage(method: string, params: any): void {
 self.onmessage = async(event: MessageEvent): Promise<void> => {
   const messageFromFrontend = JSON.parse(event.data);
   switch (messageFromFrontend.method) {
-    case 'navigate':
-    case 'start': {
+    case 'startTimespan':
+    case 'endTimespan':
+    case 'snapshot':
+    case 'navigation': {
       const result = await start(messageFromFrontend.method, messageFromFrontend.params);
       self.postMessage(JSON.stringify({id: messageFromFrontend.id, result}));
       break;

package/front_end/entrypoints/main/MainImpl.ts

@@ -309,9 +309,14 @@ export class MainImpl {
         'timelineV8RuntimeCallStats', 'Timeline: V8 Runtime Call Stats on Timeline', true);
     Root.Runtime.experiments.register('timelineWebGL', 'Timeline: WebGL-based flamechart');
     Root.Runtime.experiments.register('timelineReplayEvent', 'Timeline: Replay input events', true);
+
+    // Debugging
     Root.Runtime.experiments.register(
         'wasmDWARFDebugging', 'WebAssembly Debugging: Enable DWARF support', undefined,
         'https://developer.chrome.com/blog/wasm-debugging-2020/');
+    Root.Runtime.experiments.register(
+        'evaluateExpressionsWithSourceMaps', 'Console: Resolve variable names in expressions using source maps',
+        undefined);
 
     // Dual-screen
     Root.Runtime.experiments.register(
@@ -376,6 +381,9 @@ export class MainImpl {
     Root.Runtime.experiments.register(
         Root.Runtime.ExperimentName.HEADER_OVERRIDES, 'Local overrides for response headers');
 
+    // New Lighthouse panel with timespan and snapshot mode
+    Root.Runtime.experiments.register('lighthousePanelFR', 'Use Lighthouse panel with timespan and snapshot modes');
+
     Root.Runtime.experiments.enableExperimentsByDefault([
       'sourceOrderViewer',
       'hideIssuesFeature',