Reland "Port IssuesModel to TypeScript"

This is a reland of 892d5ae.

The only additional change is fixing a race condition in the NetworkLog
constructor which caused browser test
"WorkerDevToolsSanityTest.InspectSharedWorkerNetworkPanel" to fail.

original change: https://crrev.com/c/2213439
revert: https://crrev.com/c/2217412

Bug: chromium:1011811, chromium:1079233, chromium:1058320
Change-Id: I3201de972ba238d1f9e01b785d345beb8f0e32a1
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2217416
Reviewed-by: Tim van der Lippe <[email protected]>
Reviewed-by: Simon Zünd <[email protected]>
Commit-Queue: Wolfgang Beyer <[email protected]>

Author: wolfib

front_end/browser_sdk/LogManager.js

@@ -47,7 +47,8 @@ export class LogManager {
         data.entry.stackTrace, data.entry.timestamp, undefined, undefined, data.entry.workerId);
 
     if (data.entry.networkRequestId) {
-      self.SDK.networkLog.associateConsoleMessageWithRequest(consoleMessage, data.entry.networkRequestId);
+      SDK.NetworkLog.NetworkLog.instance().associateConsoleMessageWithRequest(
+          consoleMessage, data.entry.networkRequestId);
     }
 
     if (consoleMessage.source === SDK.ConsoleModel.MessageSource.Worker) {

front_end/extensions/ExtensionServer.js

@@ -429,7 +429,7 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper {
       return this._status.OK();
     }
 
-    const request = self.SDK.networkLog.requestForURL(message.url);
+    const request = SDK.NetworkLog.NetworkLog.instance().requestForURL(message.url);
     if (request) {
       Common.Revealer.reveal(request);
       return this._status.OK();
@@ -489,7 +489,7 @@ export class ExtensionServer extends Common.ObjectWrapper.ObjectWrapper {
   }
 
   async _onGetHAR() {
-    const requests = self.SDK.networkLog.requests();
+    const requests = SDK.NetworkLog.NetworkLog.instance().requests();
     const harLog = await SDK.HARLog.HARLog.build(requests);
     for (let i = 0; i < harLog.entries.length; ++i) {
       harLog.entries[i]._requestId = this._requestId(requests[i]);

front_end/issues/IssuesPane.js

@@ -108,12 +108,12 @@ class AffectedResourcesView extends UI.TreeOutline.TreeElement {
    * @return {!Array<!SDK.NetworkRequest.NetworkRequest>}
    */
   _resolveRequestId(requestId) {
-    const requests = self.SDK.networkLog.requestsForId(requestId);
+    const requests = SDK.NetworkLog.NetworkLog.instance().requestsForId(requestId);
     if (!requests.length) {
       this._unresolvedRequestIds.add(requestId);
       if (!this._listener) {
-        this._listener =
-            self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestAdded, this._onRequestAdded, this);
+        this._listener = SDK.NetworkLog.NetworkLog.instance().addEventListener(
+            SDK.NetworkLog.Events.RequestAdded, this._onRequestAdded, this);
       }
     }
     return requests;

front_end/network/NetworkDataGridNode.js

@@ -749,7 +749,7 @@ export class NetworkRequestNode extends NetworkNode {
   showingInitiatorChainChanged() {
     const showInitiatorChain = this.showingInitiatorChain();
 
-    const initiatorGraph = self.SDK.networkLog.initiatorGraphForRequest(this._request);
+    const initiatorGraph = SDK.NetworkLog.NetworkLog.instance().initiatorGraphForRequest(this._request);
     for (const request of initiatorGraph.initiators) {
       if (request === this._request) {
         continue;
@@ -1176,7 +1176,7 @@ export class NetworkRequestNode extends NetworkNode {
   _renderInitiatorCell(cell) {
     this._initiatorCell = cell;
     const request = this._request;
-    const initiator = self.SDK.networkLog.initiatorInfoForRequest(request);
+    const initiator = SDK.NetworkLog.NetworkLog.instance().initiatorInfoForRequest(request);
 
     const timing = request.timing;
     if (timing && timing.pushStart) {

front_end/network/NetworkLogView.js

@@ -193,9 +193,11 @@ export class NetworkLogView extends UI.Widget.VBox {
         .addChangeListener(this._invalidateAllItems.bind(this, false), this);
 
     SDK.SDKModel.TargetManager.instance().observeModels(SDK.NetworkManager.NetworkManager, this);
-    self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestAdded, this._onRequestUpdated, this);
-    self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestUpdated, this._onRequestUpdated, this);
-    self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.Reset, this._reset, this);
+    SDK.NetworkLog.NetworkLog.instance().addEventListener(
+        SDK.NetworkLog.Events.RequestAdded, this._onRequestUpdated, this);
+    SDK.NetworkLog.NetworkLog.instance().addEventListener(
+        SDK.NetworkLog.Events.RequestUpdated, this._onRequestUpdated, this);
+    SDK.NetworkLog.NetworkLog.instance().addEventListener(SDK.NetworkLog.Events.Reset, this._reset, this);
 
     this._updateGroupByFrame();
     Common.Settings.Settings.instance()
@@ -558,7 +560,8 @@ export class NetworkLogView extends UI.Widget.VBox {
       this._harLoadFailed(e);
       return;
     }
-    self.SDK.networkLog.importRequests(HARImporter.HARImporter.Importer.requestsFromHARLog(harRoot.log));
+    SDK.NetworkLog.NetworkLog.instance().importRequests(
+        HARImporter.HARImporter.Importer.requestsFromHARLog(harRoot.log));
   }
 
   /**
@@ -841,7 +844,7 @@ export class NetworkLogView extends UI.Widget.VBox {
     let maxTime = -1;
 
     let nodeCount = 0;
-    for (const request of self.SDK.networkLog.requests()) {
+    for (const request of SDK.NetworkLog.NetworkLog.instance().requests()) {
       const node = request[_networkNodeSymbol];
       if (!node) {
         continue;
@@ -972,7 +975,7 @@ export class NetworkLogView extends UI.Widget.VBox {
    * @param {boolean=} deferUpdate
    */
   _invalidateAllItems(deferUpdate) {
-    this._staleRequests = new Set(self.SDK.networkLog.requests());
+    this._staleRequests = new Set(SDK.NetworkLog.NetworkLog.instance().requests());
     if (deferUpdate) {
       this.scheduleRefresh();
     } else {
@@ -1489,7 +1492,7 @@ export class NetworkLogView extends UI.Widget.VBox {
   }
 
   _harRequests() {
-    return self.SDK.networkLog.requests().filter(NetworkLogView.HTTPRequestsFilter).filter(request => {
+    return SDK.NetworkLog.NetworkLog.instance().requests().filter(NetworkLogView.HTTPRequestsFilter).filter(request => {
       return request.finished ||
           (request.resourceType() === Common.ResourceType.resourceTypes.WebSocket && request.responseReceivedTime);
     });
@@ -1513,7 +1516,7 @@ export class NetworkLogView extends UI.Widget.VBox {
    * @param {string} platform
    */
   async _copyAllCurlCommand(platform) {
-    const commands = await this._generateAllCurlCommand(self.SDK.networkLog.requests(), platform);
+    const commands = await this._generateAllCurlCommand(SDK.NetworkLog.NetworkLog.instance().requests(), platform);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.copyText(commands);
   }
 
@@ -1530,7 +1533,7 @@ export class NetworkLogView extends UI.Widget.VBox {
    * @param {boolean} includeCookies
    */
   async _copyAllFetchCall(includeCookies) {
-    const commands = await this._generateAllFetchCall(self.SDK.networkLog.requests(), includeCookies);
+    const commands = await this._generateAllFetchCall(SDK.NetworkLog.NetworkLog.instance().requests(), includeCookies);
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.copyText(commands);
   }
 
@@ -1543,7 +1546,7 @@ export class NetworkLogView extends UI.Widget.VBox {
   }
 
   async _copyAllPowerShellCommand() {
-    const commands = await this._generateAllPowerShellCommand(self.SDK.networkLog.requests());
+    const commands = await this._generateAllPowerShellCommand(SDK.NetworkLog.NetworkLog.instance().requests());
     Host.InspectorFrontendHost.InspectorFrontendHostInstance.copyText(commands);
   }
 

front_end/network/NetworkPanel.js

@@ -180,9 +180,11 @@ export class NetworkPanel extends UI.Panel.Panel {
         SDK.ResourceTreeModel.ResourceTreeModel, SDK.ResourceTreeModel.Events.Load, this._load, this);
     this._networkLogView.addEventListener(Events.RequestSelected, this._onRequestSelected, this);
     this._networkLogView.addEventListener(Events.RequestActivated, this._onRequestActivated, this);
-    self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestAdded, this._onUpdateRequest, this);
-    self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.RequestUpdated, this._onUpdateRequest, this);
-    self.SDK.networkLog.addEventListener(SDK.NetworkLog.Events.Reset, this._onNetworkLogReset, this);
+    SDK.NetworkLog.NetworkLog.instance().addEventListener(
+        SDK.NetworkLog.Events.RequestAdded, this._onUpdateRequest, this);
+    SDK.NetworkLog.NetworkLog.instance().addEventListener(
+        SDK.NetworkLog.Events.RequestUpdated, this._onUpdateRequest, this);
+    SDK.NetworkLog.NetworkLog.instance().addEventListener(SDK.NetworkLog.Events.Reset, this._onNetworkLogReset, this);
   }
 
   /**
@@ -248,7 +250,8 @@ export class NetworkPanel extends UI.Panel.Panel {
     }
     this._panelToolbar.appendToolbarItem(UI.Toolbar.Toolbar.createActionButton(this._toggleRecordAction));
     const clearButton = new UI.Toolbar.ToolbarButton(Common.UIString.UIString('Clear'), 'largeicon-clear');
-    clearButton.addEventListener(UI.Toolbar.ToolbarButton.Events.Click, () => self.SDK.networkLog.reset(), this);
+    clearButton.addEventListener(
+        UI.Toolbar.ToolbarButton.Events.Click, () => SDK.NetworkLog.NetworkLog.instance().reset(), this);
     this._panelToolbar.appendToolbarItem(clearButton);
     this._panelToolbar.appendSeparator();
 
@@ -322,7 +325,7 @@ export class NetworkPanel extends UI.Panel.Panel {
 
   _toggleRecording() {
     if (!this._preserveLogSetting.get() && !this._toggleRecordAction.toggled()) {
-      self.SDK.networkLog.reset();
+      SDK.NetworkLog.NetworkLog.instance().reset();
     }
     this._toggleRecord(!this._toggleRecordAction.toggled());
   }
@@ -338,7 +341,7 @@ export class NetworkPanel extends UI.Panel.Panel {
     }
     // TODO(einbinder) This should be moved to a setting/action that NetworkLog owns but NetworkPanel controls, but
     // always be present in the command menu.
-    self.SDK.networkLog.setIsRecording(toggled);
+    SDK.NetworkLog.NetworkLog.instance().setIsRecording(toggled);
   }
 
   /**

front_end/network/NetworkSearchScope.js

@@ -28,8 +28,8 @@ export class NetworkSearchScope {
    */
   async performSearch(searchConfig, progress, searchResultCallback, searchFinishedCallback) {
     const promises = [];
-    const requests =
-        self.SDK.networkLog.requests().filter(request => searchConfig.filePathMatchesFileQuery(request.url()));
+    const requests = SDK.NetworkLog.NetworkLog.instance().requests().filter(
+        request => searchConfig.filePathMatchesFileQuery(request.url()));
     progress.setTotalWork(requests.length);
     for (const request of requests) {
       const promise = this._searchRequest(searchConfig, request, progress);

front_end/network/RequestInitiatorView.js

@@ -134,7 +134,7 @@ export class RequestInitiatorView extends UI.Widget.VBox {
       this._appendExpandableSection(stackTracePreview.element, ls`Request call stack`, true);
     }
 
-    const initiatorGraph = self.SDK.networkLog.initiatorGraphForRequest(this._request);
+    const initiatorGraph = SDK.NetworkLog.NetworkLog.instance().initiatorGraphForRequest(this._request);
     if (initiatorGraph.initiators.size > 1 || initiatorGraph.initiated.size > 1) {
       initiatorDataPresent = true;
       this._appendExpandableSection(

front_end/network_test_runner/NetworkTestRunner.js

@@ -57,7 +57,7 @@ NetworkTestRunner.networkWaterfallColumn = function() {
 };
 
 NetworkTestRunner.networkRequests = function() {
-  return Array.from(self.SDK.networkLog.requests());
+  return Array.from(SDK.NetworkLog.instance().requests());
 };
 
 NetworkTestRunner.dumpNetworkRequests = function() {
@@ -75,7 +75,7 @@ NetworkTestRunner.dumpNetworkRequests = function() {
 };
 
 NetworkTestRunner.dumpNetworkRequestsWithSignedExchangeInfo = function() {
-  for (const request of self.SDK.networkLog.requests()) {
+  for (const request of SDK.NetworkLog.instance().requests()) {
     TestRunner.addResult(`* ${request.url()}`);
     TestRunner.addResult(`  failed: ${!!request.failed}`);
     TestRunner.addResult(`  statusCode: ${request.statusCode}`);

front_end/protocol_client/InspectorBackend.js

@@ -650,6 +650,13 @@ export class TargetBase {
 
   // Agent accessors, keep alphabetically sorted.
 
+  /**
+   * @return {!ProtocolProxyApi.AuditsApi}
+   */
+  auditsAgent() {
+    throw new Error('Implemented in InspectorBackend.js');
+  }
+
   /**
    * @return {!ProtocolProxyApi.CacheStorageApi}
    */
@@ -744,6 +751,13 @@ export class TargetBase {
 
   // Dispatcher registration, keep alphabetically sorted.
 
+  /**
+   * @param {!ProtocolProxyApi.AuditsDispatcher} dispatcher
+   */
+  registerAuditsDispatcher(dispatcher) {
+    throw new Error('Implemented in InspectorBackend.js');
+  }
+
   /**
    * @param {!ProtocolProxyApi.DebuggerDispatcher} dispatcher
    */

front_end/sdk/IssuesModel.js

@@ -2,12 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @ts-nocheck
-// TODO(crbug.com/1011811): Enable TypeScript compiler checks
-
 import {CrossOriginEmbedderPolicyIssue} from './CrossOriginEmbedderPolicyIssue.js';
 import {Issue} from './Issue.js';  // eslint-disable-line no-unused-vars
 import {MixedContentIssue} from './MixedContentIssue.js';
+import {NetworkLog} from './NetworkLog.js';
 import {Events as NetworkManagerEvents, NetworkManager} from './NetworkManager.js';
 import {NetworkRequest} from './NetworkRequest.js';  // eslint-disable-line no-unused-vars
 import {SameSiteCookieIssue} from './SameSiteCookieIssue.js';
@@ -30,7 +28,7 @@ export class NetworkIssueDetector {
     if (this._networkManager) {
       this._networkManager.addEventListener(NetworkManagerEvents.RequestFinished, this._handleRequestFinished, this);
     }
-    for (const request of self.SDK.networkLog.requests()) {
+    for (const request of NetworkLog.instance().requests()) {
       this._handleRequestFinished({data: request});
     }
   }
@@ -78,7 +76,7 @@ export class NetworkIssueDetector {
  * class (usually derived from `Issue`) and passes the instances on via a dispatched event.
  * We chose this approach here because the lifetime of the Model is tied to the target, but DevTools
  * wants to preserve issues for targets (e.g. iframes) that are already gone as well.
- * @implements {Protocol.AuditsDispatcher}
+ * @implements {ProtocolProxyApiWorkaround_AuditsDispatcher}
  */
 export class IssuesModel extends SDKModel {
   /**
@@ -93,6 +91,13 @@ export class IssuesModel extends SDKModel {
     this.ensureEnabled();
   }
 
+  /**
+   * @return {!Protocol.UsesObjectNotation}
+   */
+  usesObjectNotation() {
+    return true;
+  }
+
   ensureEnabled() {
     if (this._enabled) {
       return;
@@ -101,16 +106,16 @@ export class IssuesModel extends SDKModel {
     this._enabled = true;
     this.target().registerAuditsDispatcher(this);
     this._auditsAgent = this.target().auditsAgent();
-    this._auditsAgent.enable();
+    this._auditsAgent.invoke_enable();
     this._networkIssueDetector = new NetworkIssueDetector(this.target(), this);
   }
 
   /**
    * @override
-   * @param {!Protocol.Audits.InspectorIssue} inspectorIssue
+   * @param {!Protocol.Audits.IssueAddedEvent} issueAddedEvent
    */
-  issueAdded(inspectorIssue) {
-    const issues = this._createIssuesFromProtocolIssue(inspectorIssue);
+  issueAdded(issueAddedEvent) {
+    const issues = this._createIssuesFromProtocolIssue(issueAddedEvent.issue);
     for (const issue of issues) {
       this.addIssue(issue);
     }

front_end/sdk/NetworkLog.js

@@ -38,6 +38,9 @@ import {Events as ResourceTreeModelEvents, ResourceTreeFrame, ResourceTreeModel}
 import {RuntimeModel} from './RuntimeModel.js';
 import {SDKModelObserver, TargetManager} from './SDKModel.js';  // eslint-disable-line no-unused-vars
 
+/** @type {!NetworkLog} */
+let _instance;
+
 /**
  * @implements {SDKModelObserver<!NetworkManager>}
  */
@@ -54,11 +57,21 @@ export class NetworkLog extends Common.ObjectWrapper.ObjectWrapper {
     this._pageLoadForManager = new Map();
     /** @type {boolean} */
     this._isRecording = true;
-    TargetManager.instance().observeModels(NetworkManager, this);
     /** @type {!WeakMap<!NetworkManager, !Array<!Common.EventTarget.EventDescriptor>>} */
     this._modelListeners = new WeakMap();
     /** @type {!WeakMap<!NetworkRequest, !InitiatorData>} */
     this._initiatorData = new WeakMap();
+    TargetManager.instance().observeModels(NetworkManager, this);
+  }
+
+  /**
+   * @return {!NetworkLog}
+   */
+  static instance() {
+    if (!_instance) {
+      _instance = new NetworkLog();
+    }
+    return _instance;
   }
 
   /**

front_end/sdk/sdk-legacy.js

@@ -253,4 +253,3 @@ SDK.TracingModel.Event = SDKModule.TracingModel.Event;
 self.SDK.targetManager = SDKModule.SDKModel.TargetManager.instance();
 self.SDK.isolateManager = new SDKModule.IsolateManager.IsolateManager();
 self.SDK.domModelUndoStack = new SDKModule.DOMModel.DOMModelUndoStack();
-self.SDK.networkLog = new SDKModule.NetworkLog.NetworkLog();