[DevTools]: Require explicit connection

third_party/WebKit/Source/devtools/front_end/sdk/SubTargetsManager.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @extends {WebInspector.SDKModel}
  * @param {!WebInspector.Target} target
  */
 WebInspector.SubTargetsManager = function(target)
 {
     WebInspector.SDKModel.call(this, WebInspector.SubTargetsManager, target);
     target.registerTargetDispatcher(new WebInspector.SubTargetsDispatcher(this));
     this._lastAnonymousTargetId = 0;
     this._agent = target.targetAgent();
 
     /** @type {!Map<string, !WebInspector.Target>} */
     this._attachedTargets = new Map();
     /** @type {!Map<string, !WebInspector.SubTargetConnection>} */
     this._connections = new Map();
+    /** @type {!Map<string, !WebInspector.PendingSubTarget>} */
+    this._pendingSubTargets = new Map();
 
     this._agent.setAutoAttach(true /* autoAttach */, true /* waitForDebuggerOnStart */);
     if (Runtime.experiments.isEnabled("autoAttachToCrossProcessSubframes"))
         this._agent.setAttachToFrames(true);
 
     if (Runtime.experiments.isEnabled("nodeDebugging") && !target.parentTarget()) {
         var defaultLocations = [{host: "localhost", port: 9229}];
         this._agent.setRemoteLocations(defaultLocations);
         this._agent.setDiscoverTargets(true);
     }
     WebInspector.targetManager.addEventListener(WebInspector.TargetManager.Events.MainFrameNavigated, this._mainFrameNavigated, this);
 };
 
 /** @enum {symbol} */
 WebInspector.SubTargetsManager.Events = {
     SubTargetAdded: Symbol("SubTargetAdded"),
     SubTargetRemoved: Symbol("SubTargetRemoved"),
+    SubTargetAttached: Symbol("SubTargetAttached"),
+    SubTargetDetached: Symbol("SubTargetDetached"),
 };
 
 WebInspector.SubTargetsManager._InfoSymbol = Symbol("SubTargetInfo");
 
 WebInspector.SubTargetsManager.prototype = {
     /**
      * @override
      * @return {!Promise}
      */
     suspendModel: function()
@@ skipping 14 matching lines @@
         var promise = new Promise(f => fulfill = f);
         this._agent.setAutoAttach(true /* autoAttach */, true /* waitForDebuggerOnStart */, fulfill);
         return promise;
     },
 
     /**
      * @override
      */
     dispose: function()
     {
-        for (var connection of this._connections.values()) {
-            this._agent.detachFromTarget(connection._targetId);

[dgozman, 2016/11/01 22:07:39]

I think it was important to send this to the agent.

[eostroukhov, 2016/11/02 21:55:53]

It does so in the _detachedFromTarget

-            connection._onDisconnect.call(null, "disposed");
-        }
-        this._connections.clear();
-        this._attachedTargets.clear();
+        for (var attachedTargetId of this._attachedTargets.keys())
+            this._detachedFromTarget(attachedTargetId);
+        for (var pendingConnectionId of this._pendingSubTargets.keys())
+            this._targetDestroyed(pendingConnectionId);
     },
 
     /**
      * @param {!TargetAgent.TargetID} targetId
      */
     activateTarget: function(targetId)
     {
         this._agent.activateTarget(targetId);
     },
 
@@ skipping 74 matching lines @@
         }
         var target = WebInspector.targetManager.createTarget(targetName, this._capabilitiesForType(targetInfo.type), this._createConnection.bind(this, targetInfo.id), this.target());
         target[WebInspector.SubTargetsManager._InfoSymbol] = targetInfo;
         this._attachedTargets.set(targetInfo.id, target);
 
         // Only pause new worker if debugging SW - we are going through the pause on start checkbox.
         var mainIsServiceWorker = !this.target().parentTarget() && this.target().hasTargetCapability() && !this.target().hasBrowserCapability();
         if (mainIsServiceWorker && waitingForDebugger)
             target.debuggerAgent().pause();
         target.runtimeAgent().runIfWaitingForDebugger();
-
-        this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetAdded, target);
+        var connection = this._pendingSubTargets.get(targetInfo.id);
+        if (!connection) {
+            this._targetCreated(targetInfo);
+            connection = this._pendingSubTargets.get(targetInfo.id);
+        }
+        connection.notifyAttached(target);
+        this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetAttached, connection);
     },
 
     /**
      * @param {string} targetId
      * @param {!InspectorBackendClass.Connection.Params} params
      * @return {!InspectorBackendClass.Connection}
      */
     _createConnection: function(targetId, params)
     {
         var connection = new WebInspector.SubTargetConnection(this._agent, targetId, params);
         this._connections.set(targetId, connection);
         return connection;
     },
 
     /**
      * @param {string} targetId
      */
     _detachedFromTarget: function(targetId)
     {
         var target = this._attachedTargets.get(targetId);
         this._attachedTargets.delete(targetId);
-        this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetRemoved, target);
         var connection = this._connections.get(targetId);
-        if (connection)
-            connection._onDisconnect.call(null, "target terminated");
+        connection._onDisconnect.call(null, "target terminated");
         this._connections.delete(targetId);
+        this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetDetached, this._pendingSubTargets.get(targetId));
     },
 
     /**
      * @param {string} targetId
      * @param {string} message
      */
     _receivedMessageFromTarget: function(targetId, message)
     {
         var connection = this._connections.get(targetId);
         if (connection)
             connection._onMessage.call(null, message);
     },
 
     /**
      * @param {!WebInspector.TargetInfo} targetInfo
      */
     _targetCreated: function(targetInfo)
     {
-        if (targetInfo.type !== "node")
-            return;
-        this._agent.attachToTarget(targetInfo.id);
+        var connection = this._pendingSubTargets.get(targetInfo.id);
+        console.assert(!connection);
+        connection = new WebInspector.PendingSubTarget(targetInfo.id, targetInfo.title, targetInfo.type === "node", this);
+        this._pendingSubTargets.set(targetInfo.id, connection);
+        this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetAdded, connection);
     },
 
     /**
      * @param {string} targetId
      */
     _targetDestroyed: function(targetId)
     {
-        // All the work is done in _detachedFromTarget.
+        var connection = this._pendingSubTargets.get(targetId);
+        if (!connection)
+            return;
+        this._pendingSubTargets.delete(targetId);
+        this.dispatchEventToListeners(WebInspector.SubTargetsManager.Events.SubTargetRemoved, connection);
     },
 
     /**
+     * @return {!Array<!WebInspector.PendingSubTarget>}
+     */
+    subTargets: function()
+    {
+        return this._pendingSubTargets.valuesArray();
+    },
+
+    /**
      * @param {!WebInspector.Event} event
      */
     _mainFrameNavigated: function(event)
     {
         if (event.data.target() !== this.target())
             return;
 
         var idsToDetach = [];
         for (var targetId of this._attachedTargets.keys()) {
             var target = this._attachedTargets.get(targetId);
             var targetInfo = this.targetInfo(target);
             if (targetInfo.type === "worker")
                 idsToDetach.push(targetId);
         }
         idsToDetach.forEach(id => this._detachedFromTarget(id));
     },
 
     __proto__: WebInspector.SDKModel.prototype
 };
 
 /**
+ * @param {!WebInspector.Target} target
+ * @return {?WebInspector.SubTargetsManager}
+ */
+WebInspector.SubTargetsManager.fromTarget = function(target)
+{
+    return /** @type {?WebInspector.SubTargetsManager} */ (target.model(WebInspector.SubTargetsManager));
+};
+
+
+/**
  * @constructor
  * @implements {TargetAgent.Dispatcher}
  * @param {!WebInspector.SubTargetsManager} manager
  */
 WebInspector.SubTargetsDispatcher = function(manager)
 {
     this._manager = manager;
 };
 
 WebInspector.SubTargetsDispatcher.prototype = {
@@ skipping 90 matching lines @@
     this.url = payload.url;
     this.type = payload.type;
     this.canActivate = this.type === "page" || this.type === "iframe";
     if (this.type === "node")
         this.title = WebInspector.UIString("Node: %s", this.url);
     else if (this.type === "page" || this.type === "iframe")
         this.title = payload.title;
     else
         this.title = WebInspector.UIString("Worker: %s", this.url);
 };
+
+/**
+ * @constructor
+ * @param {string} id
+ * @param {string} title
+ * @param {boolean} isRemote
+ * @param {?WebInspector.SubTargetsManager} manager
+ */
+WebInspector.PendingSubTarget = function(id, title, isRemote, manager)
+{
+    this._id = id;
+    this._title = title;
+    this._isRemote = isRemote;
+    this._manager = manager;
+    /** @type {?Promise} */
+    this._connectPromise = null;
+    /** @type {?Function} */
+    this._attachedCallback = null;
+};
+
+WebInspector.PendingSubTarget.prototype = {
+    /**
+     * @return {string}
+     */
+    id: function()
+    {
+        return this._id;
+    },
+
+    /**
+     * @return {?WebInspector.Target}
+     */
+    target: function()
+    {
+        if (!this._manager)
+            return null;
+        return this._manager.targetForId(this.id());
+    },
+
+    /**
+     * @return {string}
+     */
+    name: function()
+    {
+        return this._title;
+    },
+
+    /**
+     * @return {!Promise}
+     */
+    connect: function()
+    {
+        if (!this._manager)
+            return Promise.reject();
+        if (this._connectPromise)
+            return this._connectPromise;
+        if (this.target())
+            return Promise.resolve(this.target());
+        this._connectPromise = new Promise(resolve => {
+            this._attachedCallback = resolve;
+            this._manager._agent.attachToTarget(this.id());
+        });
+        return this._connectPromise;
+    },
+
+    disconnect: function()
+    {
+        if (!this._manager)
+            return;
+        this._manager._agent.detachFromTarget(this.id());
+    },
+
+    /**
+     * @param {!WebInspector.Target} target
+     */
+    notifyAttached: function(target)
+    {
+        if (this._attachedCallback)
+            this._attachedCallback(target);
+        this._connectPromise = null;
+        this._attachedCallback = null;
+    },
+
+    /**
+     * @return {boolean}
+     */
+    isRemote: function()

[dgozman, 2016/11/01 22:07:39]

canConnect?

[eostroukhov, 2016/11/02 21:55:53]

Done.

+    {
+        return this._isRemote;
+    },
+};