Wait for debugger to disconnect after app is done.

Author: pavelfeldman

src/inspector_agent.cc

@@ -84,7 +84,7 @@ class AsyncWriteRequest {
   AsyncWriteRequest(Agent* agent, const String16& message) :
                     agent_(agent), message_(message) {}
   void perform() {
-    inspector_socket_t* socket = agent_->client_socket();
+    inspector_socket_t* socket = agent_->client_socket_;
     if (socket) {
       inspector_write(socket, message_.utf8().c_str(), message_.length());
     }
@@ -94,6 +94,21 @@ class AsyncWriteRequest {
   const String16 message_;
 };
 
+class SetConnectedTask : public v8::Task {
+ public:
+  SetConnectedTask(Agent* agent, bool connected)
+     : agent_(agent),
+       connected_(connected) {}
+
+  void Run() override {
+    agent_->connected_ = connected_;
+  }
+
+ private:
+  Agent* agent_;
+  bool connected_;
+};
+
 static void DisposeAsyncCb(uv_handle_t* handle) {
   free(handle);
 }
@@ -171,6 +186,7 @@ static void SendTargentsListResponse(inspector_socket_t* socket) {
 
 Agent::Agent(Environment* env) : port_(5858),
                                  wait_(false),
+                                 connected_(false),
                                  parent_env_(env),
                                  client_socket_(nullptr),
                                  platform_(nullptr) {
@@ -281,6 +297,10 @@ void Agent::OnRemoteData(uv_stream_t* stream, ssize_t read, const uv_buf_t* b) {
       agent->client_socket_ = nullptr;
     }
     DisconnectAndDispose(socket);
+  } else {
+    // EOF
+    agent->platform_->CallOnForegroundThread(agent->parent_env()->isolate(),
+        new SetConnectedTask(agent, false));
   }
 }
 
@@ -306,6 +326,8 @@ void Agent::OnInspectorConnection(inspector_socket_t* socket) {
   client_socket_ = socket;
   inspector_read_start(socket, OnBufferAlloc, OnRemoteData);
   uv_sem_post(&start_sem_);
+  platform_->CallOnForegroundThread(parent_env()->isolate(),
+      new SetConnectedTask(this, true));
 }
 
 bool Agent::RespondToGet(inspector_socket_t* socket, const char* path) {

src/inspector_agent.h

@@ -57,7 +57,8 @@ class Agent {
 
   void PostMessages();
 
-  inspector_socket_t* client_socket() {  return client_socket_; }
+  bool connected() {  return connected_; }
+
  protected:
   inline node::Environment* parent_env() {  return parent_env_; }
   void InitAdaptor(Environment* env);
@@ -74,6 +75,7 @@ class Agent {
 
   int port_;
   bool wait_;
+  bool connected_;
 
   uv_thread_t thread_;
   node::Environment* parent_env_;
@@ -101,7 +103,9 @@ class Agent {
   void OnInspectorConnection(inspector_socket_t* socket);
   void write(const blink::protocol::String16& message);
 
+  friend class AsyncWriteRequest;
   friend class ChannelImpl;
+  friend class SetConnectedTask;
 };
 
 }  // namespace inspector

src/inspector_socket.cc

@@ -319,6 +319,7 @@ static void on_close_frame_written(uv_write_t* write, int status) {
 static void close_frame_received(inspector_socket_t* inspector) {
   inspector->ws_state->received_close = true;
   if (!inspector->ws_state->close_sent) {
+    invoke_read_callback(inspector, 0, 0);
     write_to_client(inspector, CLOSE_FRAME, sizeof(CLOSE_FRAME),
                     on_close_frame_written);
   } else {

src/node.cc

@@ -4433,6 +4433,14 @@ static void StartNodeInstance(void* arg) {
       } while (more == true);
     }
 
+#if HAVE_INSPECTOR
+    if (env->inspector_agent()->connected())
+      fprintf(stderr, "Waiting for the debugger to disconnect...\n");
+    while (env->inspector_agent()->connected()) {
+      v8::platform::PumpMessageLoop(default_platform, isolate);
+    }
+#endif
+
     env->set_trace_sync_io(false);
 
     int exit_code = EmitExit(env);