debug 1.2.4 → 1.3.0

data/lib/debug/server_dap.rb

@@ -6,11 +6,17 @@ module DEBUGGER__
   module UI_DAP
     SHOW_PROTOCOL = ENV['RUBY_DEBUG_DAP_SHOW_PROTOCOL'] == '1'
 
+    def show_protocol dir, msg
+      if SHOW_PROTOCOL
+        $stderr.puts "\##{Process.pid}:[#{dir}] #{msg}"
+      end
+    end
+
     def dap_setup bytes
       CONFIG.set_config no_color: true
       @seq = 0
 
-      $stderr.puts '[>]' + bytes if SHOW_PROTOCOL
+      show_protocol :>, bytes
       req = JSON.load(bytes)
 
       # capability
@@ -80,10 +86,8 @@ module DEBUGGER__
     def send **kw
       kw[:seq] = @seq += 1
       str = JSON.dump(kw)
-      $stderr.puts "[<] #{str}" if SHOW_PROTOCOL
-      # STDERR.puts "[STDERR] [<] #{str}"
-      @sock.print header = "Content-Length: #{str.size}\r\n\r\n"
-      @sock.write str
+      show_protocol '<', str
+      @sock.write "Content-Length: #{str.size}\r\n\r\n#{str}"
     end
 
     def send_response req, success: true, **kw
@@ -111,19 +115,32 @@ module DEBUGGER__
       end
     end
 
+    class RetryBecauseCantRead < Exception
+    end
+
     def recv_request
-      case header = @sock.gets
-      when /Content-Length: (\d+)/
-        b = @sock.read(2)
-        raise b.inspect unless b == "\r\n"
-
-        l = @sock.read(s = $1.to_i)
-        $stderr.puts "[>] #{l}" if SHOW_PROTOCOL
-        JSON.load(l)
-      when nil
-        nil
-      else
-        raise "unrecognized line: #{l} (#{l.size} bytes)"
+      begin
+        r = IO.select([@sock])
+
+        @session.process_group.sync do
+          raise RetryBecauseCantRead unless IO.select([@sock], nil, nil, 0)
+
+          case header = @sock.gets
+          when /Content-Length: (\d+)/
+            b = @sock.read(2)
+            raise b.inspect unless b == "\r\n"
+
+            l = @sock.read(s = $1.to_i)
+            show_protocol :>, l
+            JSON.load(l)
+          when nil
+            nil
+          else
+            raise "unrecognized line: #{l} (#{l.size} bytes)"
+          end
+        end
+      rescue RetryBecauseCantRead
+        retry
       end
     end
 
@@ -137,6 +154,11 @@ module DEBUGGER__
         ## boot/configuration
         when 'launch'
           send_response req
+          @is_attach = false
+        when 'attach'
+          send_response req
+          Process.kill(:SIGURG, Process.pid)
+          @is_attach = true
         when 'setBreakpoints'
           path = args.dig('source', 'path')
           bp_args = args['breakpoints']
@@ -179,13 +201,21 @@ module DEBUGGER__
           send_response req, breakpoints: filters
         when 'configurationDone'
           send_response req
-          @q_msg << 'continue'
-        when 'attach'
-          send_response req
-          Process.kill(:SIGURG, Process.pid)
+          if defined?(@is_attach) && @is_attach
+            @q_msg << 'p'
+            send_event 'stopped', reason: 'pause',
+                                  threadId: 1,
+                                  allThreadsStopped: true
+          else
+            @q_msg << 'continue'
+          end
         when 'disconnect'
+          if args.fetch("terminateDebuggee", false)
+            @q_msg << 'kill!'
+          else
+            @q_msg << 'continue'
+          end
           send_response req
-          @q_msg << 'continue'
 
         ## control
         when 'continue'
@@ -297,7 +327,7 @@ module DEBUGGER__
       return :retry
     end
 
-    def process_dap_request req
+    def process_protocol_request req
       case req['command']
       when 'stepBack'
         if @tc.recorder&.can_step_back?