debug 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d08935b209386adbc7a1172ae0d43feb7bf31c9483aa177946fa0669db69e8
-  data.tar.gz: '01917758f048b2927a6e42b8965985477fed13011b3cd7626220ea8d1aad42fd'
+  metadata.gz: 1bac91980fb350e0e37a0639612064bba25a8e441661a6d797e0d9f996ce0205
+  data.tar.gz: 3294757150ec0731ccadd0c26a57c8e920c0479e4a967b4900e999dae4afcf9c
 SHA512:
-  metadata.gz: 6381058fe16c43d79afdc04db1dcfcff6bd3c65216ce9bc9a03b02c26dbe098011879128c2e4f3ed31b1f7cf279b590fd641b4030f6cb6308434d65d17e51110
-  data.tar.gz: c2896cca900dea7f5f4456b30f8dc4ecbed6886da74c46033e82bcda37da561759f2bd3b9a702eef7603785c17989f437b4f186817ad458edd16371c7b879688
+  metadata.gz: 7a0259c1f8fa904d9a425be5035e2642de89e69cd81cc61bd81bae2e9e7b17dbd18a78addce9e5ed8e3c7723417c0de1113a26922131760e490e77e91bb8493d
+  data.tar.gz: fd55333ccf690b4338729a2b84d55a21464ba2de71bdf5edcb0b82f309594477333224eb3be0a89c6b7c477042c4f904f8b743f74bba3931f6db4de7a9ff7dd9

data/CONTRIBUTING.md

@@ -149,10 +149,10 @@ If the file already exists, **only method** will be added to it.
 ```ruby
 # frozen_string_literal: true
 
-require_relative '../support/test_case'
+require_relative '../support/console_test_case'
 
 module DEBUGGER__
-  class FooTest < TestCase
+  class FooTest < ConsoleTestCase
     def program
       <<~RUBY
         1| module Foo

data/README.md

@@ -26,7 +26,7 @@ New debug.rb has several advantages:
   * Support threads (almost done) and ractors (TODO).
   * Support suspending and entering to the console debugging with `Ctrl-C` at most of timing.
   * Show parameters on backtrace command.
-  * Support recording & reply debugging.
+  * Support recording & replay debugging.
 
 # Installation
 
@@ -563,9 +563,9 @@ The `<...>` notation means the argument.
 * `u[ntil]`
   * Similar to `next` command, but only stop later lines or the end of the current frame.
   * Similar to gdb's `advance` command.
-* `u[ntil] <[file:]line>
+* `u[ntil] <[file:]line>`
   * Run til the program reaches given location or the end of the current frame.
-* `u[ntil] <name>
+* `u[ntil] <name>`
   * Run til the program invokes a method `<name>`. `<name>` can be a regexp with `/name/`.
 * `c` or `cont` or `continue`
   * Resume the program.

data/Rakefile

@@ -35,9 +35,14 @@ task :check_readme do
   end
 end
 
+desc "Run debug.gem test-framework tests"
+Rake::TestTask.new(:test_test) do |t|
+  t.test_files = FileList["test/support/*_test.rb"]
+end
+
 desc "Run all debugger console related tests"
 Rake::TestTask.new(:test_console) do |t|
-  t.test_files = FileList["test/console/*_test.rb", "test/support/*_test.rb"]
+  t.test_files = FileList["test/console/*_test.rb"]
 end
 
 desc "Run all debugger protocols (CAP & DAP) related tests"
@@ -46,7 +51,7 @@ Rake::TestTask.new(:test_protocol) do |t|
 end
 
 task test: 'test_console' do
-  warn '`rake test` doesn\'t run protocol tests. Use `rake test-all` to test all.'
+  warn '`rake test` doesn\'t run protocol tests. Use `rake test_all` to test all.'
 end
 
-task test_all: [:test_console, :test_protocol]
+task test_all: [:test_test, :test_console, :test_protocol]

data/TODO.md

@@ -2,22 +2,22 @@
 
 ## Basic functionality
 
-* Support Ractors
-* Signal (SIGINT) trap handling 
+* Support Fibers and Ractors
 
 ## UI
 
+* Multi-line support
 * Completion for Ruby's code
 * Interactive breakpoint setting
 * Interactive record & play debugging
 * irb integration
-* Web browser integrated UI
-* History file
 
 ## Debug command
 
-* Breakpoints
-    * Lightweight pending method break points with Ruby 3.1 feature (TP:method_added)
 * Watch points
-    * Lightweight watchpoints for instance variables with Ruby 3.1 features (TP:ivar_set)
-* Faster `next`/`finish` command by specifying target code.
+    * Lightweight watchpoints for instance variables with Ruby 3.3 features (TP:ivar_set)
+* Alias
+
+## Debug port
+
+* Debug port for monitoring

data/lib/debug/breakpoint.rb

@@ -101,10 +101,6 @@ module DEBUGGER__
     def generate_label(name)
       colorize(" BP - #{name} ", [:YELLOW, :BOLD, :REVERSE])
     end
-
-    def pending_until_load?
-      false
-    end
   end
 
   if RUBY_VERSION.to_f <= 2.7
@@ -163,10 +159,6 @@ module DEBUGGER__
       @pending = !@iseq
     end
 
-    def pending_until_load?
-      @pending
-    end
-
     def setup
       return unless @type
 
@@ -207,6 +199,8 @@ module DEBUGGER__
       if @pending && !@oneshot
         DEBUGGER__.info "#{self} is activated."
       end
+
+      @pending = false
     end
 
     def activate_exact iseq, events, line
@@ -299,6 +293,10 @@ module DEBUGGER__
     def inspect
       "<#{self.class.name} #{self.to_s}>"
     end
+
+    def path_is? path
+      DEBUGGER__.compare_path(@path, path)
+    end
   end
 
   class CatchBreakpoint < Breakpoint

data/lib/debug/config.rb

@@ -265,6 +265,8 @@ module DEBUGGER__
       require 'optparse'
       require_relative 'version'
 
+      have_shown_version = false
+
       opt = OptionParser.new do |o|
         o.banner = "#{$0} [options] -- [debuggee options]"
         o.separator ''
@@ -372,6 +374,16 @@ module DEBUGGER__
         o.separator ''
         o.separator 'Other options:'
 
+        o.on('-v', 'Show version number') do
+          puts o.ver
+          have_shown_version = true
+        end
+
+        o.on('--version', 'Show version number and exit') do
+          puts o.ver
+          exit
+        end
+
         o.on("-h", "--help", "Print help") do
           puts o
           exit
@@ -395,6 +407,14 @@ module DEBUGGER__
 
       opt.parse!(argv)
 
+      if argv.empty?
+        case
+        when have_shown_version && config[:mode] == :start
+          pp config
+          exit
+        end
+      end
+
       config
     end
 
@@ -425,8 +445,9 @@ module DEBUGGER__
     unless (dir_uid = fs.uid) == (uid = Process.uid)
       raise "#{path} uid is #{dir_uid}, but Process.uid is #{uid}"
     end
-    unless (dir_mode = fs.mode) == 040700 # 4: dir, 7:rwx
-      raise "#{path}'s mode is #{dir_mode.to_s(8)} (should be 040700)"
+
+    if fs.world_writable? && !fs.sticky?
+      raise "#{path} is world writable but not sticky"
     end
 
     path

data/lib/debug/prelude.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 return if ENV['RUBY_DEBUG_ENABLE'] == '0'
-return if defined?(::DEBUGGER__)
+return if defined?(::DEBUGGER__::Session)
 
 # Put the following line in your login script (e.g. ~/.bash_profile) with modified path:
 #

data/lib/debug/server.rb

@@ -406,14 +406,13 @@ module DEBUGGER__
       require_relative 'server_cdp'
 
       @uuid = SecureRandom.uuid
-      unless @chrome_pid = UI_CDP.setup_chrome(@local_addr.inspect_sockaddr, @uuid)
-        DEBUGGER__.warn <<~EOS
-          With Chrome browser, type the following URL in the address-bar:
+      @chrome_pid = UI_CDP.setup_chrome(@local_addr.inspect_sockaddr, @uuid)
+      DEBUGGER__.warn <<~EOS
+        With Chrome browser, type the following URL in the address-bar:
 
-             devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=#{@local_addr.inspect_sockaddr}/#{@uuid}
+           devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=#{@local_addr.inspect_sockaddr}/#{@uuid}
 
-          EOS
-      end
+        EOS
     end
 
     def accept

data/lib/debug/server_cdp.rb

@@ -34,25 +34,26 @@ module DEBUGGER__
 
         loop do
           res = ws_client.extract_data
-          case
-          when res['id'] == 1 && target_info = res.dig('result', 'targetInfos')
+          case res['id']
+          when 1
+            target_info = res.dig('result', 'targetInfos')
             page = target_info.find{|t| t['type'] == 'page'}
             ws_client.send id: 2, method: 'Target.attachToTarget',
                           params: {
                             targetId: page['targetId'],
                             flatten: true
                           }
-          when res['id'] == 2
+          when 2
             s_id = res.dig('result', 'sessionId')
             # TODO: change id
             ws_client.send sessionId: s_id, id: 100, method: 'Network.enable'
             ws_client.send sessionId: s_id, id: 3,
                           method: 'Page.enable'
-          when res['id'] == 3
+          when 3
             s_id = res['sessionId']
             ws_client.send sessionId: s_id, id: 4,
                           method: 'Page.getFrameTree'
-          when res['id'] == 4
+          when 4
             s_id = res['sessionId']
             f_id = res.dig('result', 'frameTree', 'frame', 'id')
             ws_client.send sessionId: s_id, id: 5,
@@ -61,17 +62,19 @@ module DEBUGGER__
                             url: "devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=#{addr}/#{uuid}",
                             frameId: f_id
                           }
-          when res['method'] == 'Network.webSocketWillSendHandshakeRequest'
-            s_id = res['sessionId']
-            # Display the console by entering ESC key
-            ws_client.send sessionId: s_id, id: 101,  # TODO: change id
-                          method:"Input.dispatchKeyEvent",
-                          params: {
-                            type:"keyDown",
-                            windowsVirtualKeyCode:27 # ESC key
-                          }
-          when res['id'] == 101
+          when 101
             break
+          else
+            if res['method'] == 'Network.webSocketWillSendHandshakeRequest'
+              s_id = res['sessionId']
+              # Display the console by entering ESC key
+              ws_client.send sessionId: s_id, id: 101,  # TODO: change id
+                            method:"Input.dispatchKeyEvent",
+                            params: {
+                              type:"keyDown",
+                              windowsVirtualKeyCode:27 # ESC key
+                            }
+            end
           end
         end
         pid
@@ -95,7 +98,6 @@ module DEBUGGER__
             candidates = ['C:\\Program Files (x86)\\Google\\Chrome\\Application\\chrome.exe', 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe']
             path = get_chrome_path candidates
           end
-          uuid = SecureRandom.uuid
           # The path is based on https://github.com/sindresorhus/open/blob/v8.4.0/index.js#L128.
           stdin, stdout, stderr, wait_thr = *Open3.popen3("#{ENV['SystemRoot']}\\System32\\WindowsPowerShell\\v1.0\\powershell")
           tf = Tempfile.create(['debug-', '.txt'])
@@ -447,11 +449,7 @@ module DEBUGGER__
     end
 
     def send_response req, **res
-      if res.empty?
-        @ws_server.send id: req['id'], result: {}
-      else
-        @ws_server.send id: req['id'], result: res
-      end
+      @ws_server.send id: req['id'], result: res
     end
 
     def send_fail_response req, **res
@@ -459,11 +457,7 @@ module DEBUGGER__
     end
 
     def send_event method, **params
-      if params.empty?
-        @ws_server.send method: method, params: {}
-      else
-        @ws_server.send method: method, params: params
-      end
+      @ws_server.send method: method, params: params
     end
 
     INVALID_REQUEST = -32600
@@ -554,6 +548,9 @@ module DEBUGGER__
             activate_bp bps
           end
           send_response req
+        when 'Debugger.pause'
+          send_response req
+          Process.kill(UI_ServerBase::TRAP_SIGNAL, Process.pid)
 
         # breakpoint
         when 'Debugger.getPossibleBreakpoints'
@@ -561,35 +558,31 @@ module DEBUGGER__
         when 'Debugger.setBreakpointByUrl'
           line = req.dig('params', 'lineNumber')
           if regexp = req.dig('params', 'urlRegex')
-            path = regexp.match(/(.*)\|/)[1].gsub("\\", "")
-            cond = req.dig('params', 'condition')
-            src = get_source_code path
-            end_line = src.lines.count
-            line = end_line  if line > end_line
             b_id = "1:#{line}:#{regexp}"
-            if cond != ''
-              SESSION.add_line_breakpoint(path, line + 1, cond: cond)
-            else
-              SESSION.add_line_breakpoint(path, line + 1)
-            end
             bps[b_id] = bps.size
-            # Because we need to return scriptId, responses are returned in SESSION thread.
-            req['params']['scriptId'] = path
-            req['params']['lineNumber'] = line
-            req['params']['breakpointId'] = b_id
-            @q_msg << req
+            path = regexp.match(/(.*)\|/)[1].gsub("\\", "")
+            add_line_breakpoint(req, b_id, path)
           elsif url = req.dig('params', 'url')
             b_id = "#{line}:#{url}"
-            send_response req,
-                          breakpointId: b_id,
-                          locations: []
-          elsif hash = req.dig('params', 'scriptHash')
-            b_id = "#{line}:#{hash}"
-            send_response req,
-                          breakpointId: b_id,
-                          locations: []
+            # When breakpoints are set in Script snippet, non-existent path such as "snippet:///Script%20snippet%20%231" sent.
+            # That's why we need to check it here.
+            if File.exist? url
+              bps[b_id] = bps.size
+              add_line_breakpoint(req, b_id, url)
+            else
+              send_response req,
+                            breakpointId: b_id,
+                            locations: []
+            end            
           else
-            raise 'Unsupported'
+            if hash = req.dig('params', 'scriptHash')
+              b_id = "#{line}:#{hash}"
+              send_response req,
+                            breakpointId: b_id,
+                            locations: []
+            else
+              raise 'Unsupported'
+            end
           end
         when 'Debugger.removeBreakpoint'
           b_id = req.dig('params', 'breakpointId')
@@ -628,6 +621,24 @@ module DEBUGGER__
       @q_msg << 'continue'
     end
 
+    def add_line_breakpoint req, b_id, path
+      cond = req.dig('params', 'condition')
+      line = req.dig('params', 'lineNumber')
+      src = get_source_code path
+      end_line = src.lines.count
+      line = end_line  if line > end_line
+      if cond != ''
+        SESSION.add_line_breakpoint(path, line + 1, cond: cond)
+      else
+        SESSION.add_line_breakpoint(path, line + 1)
+      end
+      # Because we need to return scriptId, responses are returned in SESSION thread.
+      req['params']['scriptId'] = path
+      req['params']['lineNumber'] = line
+      req['params']['breakpointId'] = b_id
+      @q_msg << req
+    end
+
     def del_bp bps, k
       return bps unless idx = bps[k]
 
@@ -665,37 +676,28 @@ module DEBUGGER__
     def cleanup_reader
       super
       Process.kill :KILL, @chrome_pid if @chrome_pid
+    rescue Errno::ESRCH # continue if @chrome_pid process is not found
     end
 
     ## Called by the SESSION thread
 
-    def respond req, **result
-      send_response req, **result
-    end
-
-    def respond_fail req, **result
-      send_fail_response req, **result
-    end
-
-    def fire_event event, **result
-      if result.empty?
-        send_event event
-      else
-        send_event event, **result
-      end
-    end
+    alias respond send_response
+    alias respond_fail send_fail_response
+    alias fire_event send_event
 
     def sock skip: false
       yield $stderr
     end
 
-    def puts result
+    def puts result=''
       # STDERR.puts "puts: #{result}"
       # send_event 'output', category: 'stderr', output: "PUTS!!: " + result.to_s
     end
   end
 
   class Session
+    include GlobalVariablesHelper
+
     # FIXME: unify this method with ThreadClient#propertyDescriptor.
     def get_type obj
       case obj
@@ -750,8 +752,12 @@ module DEBUGGER__
             fid = @frame_map[frame_id]
             request_tc [:cdp, :scope, req, fid]
           when 'global'
-            vars = global_variables.sort.map do |name|
-              gv = eval(name.to_s)
+            vars = safe_global_variables.sort.map do |name|
+              begin
+                gv = eval(name.to_s)
+              rescue Errno::ENOENT
+                gv = nil
+              end
               prop = {
                 name: name,
                 value: {
@@ -831,7 +837,7 @@ module DEBUGGER__
       end
     end
 
-    def cdp_event args
+    def process_protocol_result args
       type, req, result = args
 
       case type
@@ -1021,7 +1027,7 @@ module DEBUGGER__
           result[:data] = evaluate_result exception
           result[:reason] = 'exception'
         end
-        event! :cdp_result, :backtrace, req, result
+        event! :protocol_result, :backtrace, req, result
       when :evaluate
         res = {}
         fid, expr, group = args
@@ -1040,7 +1046,7 @@ module DEBUGGER__
             case expr
             # Chrome doesn't read instance variables
             when /\A\$\S/
-              global_variables.each{|gvar|
+              safe_global_variables.each{|gvar|
                 if gvar.to_s == expr
                   result = eval(gvar.to_s)
                   break false
@@ -1066,7 +1072,7 @@ module DEBUGGER__
             begin
               orig_stdout = $stdout
               $stdout = StringIO.new
-              result = current_frame.binding.eval(expr.to_s, '(DEBUG CONSOLE)')
+              result = b.eval(expr.to_s, '(DEBUG CONSOLE)')
             rescue Exception => e
               result = e
               res[:exceptionDetails] = exceptionDetails(e, 'Uncaught')
@@ -1082,7 +1088,7 @@ module DEBUGGER__
         end
 
         res[:result] = evaluate_result(result)
-        event! :cdp_result, :evaluate, req, message: message, response: res, output: output
+        event! :protocol_result, :evaluate, req, message: message, response: res, output: output
       when :scope
         fid = args.shift
         frame = @target_frames[fid]
@@ -1105,7 +1111,7 @@ module DEBUGGER__
             vars.unshift variable(name, val)
           end
         end
-        event! :cdp_result, :scope, req, vars
+        event! :protocol_result, :scope, req, vars
       when :properties
         oid = args.shift
         result = []
@@ -1147,14 +1153,14 @@ module DEBUGGER__
           }
           prop += [internalProperty('#class', M_CLASS.bind_call(obj))]
         end
-        event! :cdp_result, :properties, req, result: result, internalProperties: prop
+        event! :protocol_result, :properties, req, result: result, internalProperties: prop
       when :exception
         oid = args.shift
         exc = nil
         if obj = @obj_map[oid]
           exc = exceptionDetails obj, obj.to_s
         end
-        event! :cdp_result, :exception, req, exceptionDetails: exc
+        event! :protocol_result, :exception, req, exceptionDetails: exc
       end
     end
 

data/lib/debug/server_dap.rb

@@ -125,6 +125,7 @@ module DEBUGGER__
     def dap_setup bytes
       CONFIG.set_config no_color: true
       @seq = 0
+      @send_lock = Mutex.new
 
       case self
       when UI_UnixDomainServer
@@ -212,9 +213,13 @@ module DEBUGGER__
       if sock = @sock
         kw[:seq] = @seq += 1
         str = JSON.dump(kw)
-        sock.write "Content-Length: #{str.bytesize}\r\n\r\n#{str}"
+        @send_lock.synchronize do
+          sock.write "Content-Length: #{str.bytesize}\r\n\r\n#{str}"
+        end
         show_protocol '<', str
       end
+    rescue Errno::EPIPE => e
+      $stderr.puts "#{e.inspect} rescued during sending message"
     end
 
     def send_response req, success: true, message: nil, **kw
@@ -246,17 +251,17 @@ module DEBUGGER__
     end
 
     def recv_request
-      r = IO.select([@sock])
+      IO.select([@sock])
 
       @session.process_group.sync do
         raise RetryBecauseCantRead unless IO.select([@sock], nil, nil, 0)
 
-        case header = @sock.gets
+        case @sock.gets
         when /Content-Length: (\d+)/
           b = @sock.read(2)
           raise b.inspect unless b == "\r\n"
 
-          l = @sock.read(s = $1.to_i)
+          l = @sock.read($1.to_i)
           show_protocol :>, l
           JSON.load(l)
         when nil
@@ -309,7 +314,6 @@ module DEBUGGER__
         when 'setBreakpoints'
           req_path = args.dig('source', 'path')
           path = UI_DAP.local_to_remote_path(req_path)
-
           if path
             SESSION.clear_line_breakpoints path
 
@@ -436,11 +440,12 @@ module DEBUGGER__
         when 'evaluate'
           expr = req.dig('arguments', 'expression')
           if /\A\s*,(.+)\z/ =~ expr
-            dbg_expr = $1
+            dbg_expr = $1.strip
+            dbg_expr.split(';;') { |cmd| @q_msg << cmd }
+
             send_response req,
-                          result: "",
+                          result: "(rdbg:command) #{dbg_expr}",
                           variablesReference: 0
-            debugger do: dbg_expr
           else
             @q_msg << req
           end
@@ -452,7 +457,11 @@ module DEBUGGER__
           @q_msg << req
 
         else
-          raise "Unknown request: #{req.inspect}"
+          if respond_to? mid = "custom_dap_request_#{req['command']}"
+            __send__ mid, req
+          else
+            raise "Unknown request: #{req.inspect}"
+          end
         end
       end
     ensure
@@ -516,6 +525,8 @@ module DEBUGGER__
   end
 
   class Session
+    include GlobalVariablesHelper
+
     def find_waiting_tc id
       @th_clients.each{|th, tc|
         return tc if tc.id == id && tc.waiting?
@@ -540,7 +551,7 @@ module DEBUGGER__
       when 'stackTrace'
         tid = req.dig('arguments', 'threadId')
 
-        if tc = find_waiting_tc(tid)
+        if find_waiting_tc(tid)
           request_tc [:dap, :backtrace, req]
         else
           fail_response req
@@ -549,7 +560,7 @@ module DEBUGGER__
         frame_id = req.dig('arguments', 'frameId')
         if @frame_map[frame_id]
           tid, fid = @frame_map[frame_id]
-          if tc = find_waiting_tc(tid)
+          if find_waiting_tc(tid)
             request_tc [:dap, :scopes, req, fid]
           else
             fail_response req
@@ -562,8 +573,12 @@ module DEBUGGER__
         if ref = @var_map[varid]
           case ref[0]
           when :globals
-            vars = global_variables.sort.map do |name|
-              gv = eval(name.to_s)
+            vars = safe_global_variables.sort.map do |name|
+              begin
+                gv = eval(name.to_s)
+              rescue Exception => e
+                gv = e.inspect
+              end
               {
                 name: name,
                 value: gv.inspect,
@@ -581,7 +596,7 @@ module DEBUGGER__
             frame_id = ref[1]
             tid, fid = @frame_map[frame_id]
 
-            if tc = find_waiting_tc(tid)
+            if find_waiting_tc(tid)
               request_tc [:dap, :scope, req, fid]
             else
               fail_response req
@@ -590,7 +605,7 @@ module DEBUGGER__
           when :variable
             tid, vid = ref[1], ref[2]
 
-            if tc = find_waiting_tc(tid)
+            if find_waiting_tc(tid)
               request_tc [:dap, :variable, req, vid]
             else
               fail_response req
@@ -609,7 +624,7 @@ module DEBUGGER__
           tid, fid = @frame_map[frame_id]
           expr = req.dig('arguments', 'expression')
 
-          if tc = find_waiting_tc(tid)
+          if find_waiting_tc(tid)
             request_tc [:dap, :evaluate, req, fid, expr, context]
           else
             fail_response req
@@ -630,7 +645,7 @@ module DEBUGGER__
         frame_id = req.dig('arguments', 'frameId')
         tid, fid = @frame_map[frame_id]
 
-        if tc = find_waiting_tc(tid)
+        if find_waiting_tc(tid)
           text = req.dig('arguments', 'text')
           line = req.dig('arguments', 'line')
           if col  = req.dig('arguments', 'column')
@@ -641,11 +656,15 @@ module DEBUGGER__
           fail_response req
         end
       else
-        raise "Unknown DAP request: #{req.inspect}"
+        if respond_to? mid = "custom_dap_request_#{req['command']}"
+          __send__ mid, req
+        else
+          raise "Unknown request: #{req.inspect}"
+        end
       end
     end
 
-    def dap_event args
+    def process_protocol_result args
       # puts({dap_event: args}.inspect)
       type, req, result = args
 
@@ -693,7 +712,11 @@ module DEBUGGER__
       when :completions
         @ui.respond req, result
       else
-        raise "unsupported: #{args.inspect}"
+        if respond_to? mid = "custom_dap_request_event_#{type}"
+          __send__ mid, req, result
+        else
+          raise "unsupported: #{args.inspect}"
+        end
       end
     end
 
@@ -721,9 +744,8 @@ module DEBUGGER__
   end
 
   class ThreadClient
-
     MAX_LENGTH = 180
-    
+
     def value_inspect obj, short: true
       # TODO: max length should be configuarable?
       str = DEBUGGER__.safe_inspect obj, short: short, max_length: MAX_LENGTH
@@ -735,6 +757,14 @@ module DEBUGGER__
       end
     end
 
+    def dap_eval b, expr, _context, prompt: '(repl_eval)'
+      begin
+        b.eval(expr.to_s, prompt)
+      rescue Exception => e
+        e
+      end
+    end
+
     def process_dap args
       # pp tc: self, args: args
       type = args.shift
@@ -772,7 +802,7 @@ module DEBUGGER__
           }
         end
 
-        event! :dap_result, :backtrace, req, {
+        event! :protocol_result, :backtrace, req, {
           stackFrames: frames,
           totalFrames: @target_frames.size,
         }
@@ -789,7 +819,7 @@ module DEBUGGER__
             0
           end
 
-        event! :dap_result, :scopes, req, scopes: [{
+        event! :protocol_result, :scopes, req, scopes: [{
           name: 'Local variables',
           presentationHint: 'locals',
           # variablesReference: N, # filled by SESSION
@@ -800,7 +830,7 @@ module DEBUGGER__
           name: 'Global variables',
           presentationHint: 'globals',
           variablesReference: 1, # GLOBAL
-          namedVariables: global_variables.size,
+          namedVariables: safe_global_variables.size,
           indexedVariables: 0,
           expensive: false,
         }]
@@ -811,7 +841,7 @@ module DEBUGGER__
           variable(var, val)
         end
 
-        event! :dap_result, :scope, req, variables: vars, tid: self.id
+        event! :protocol_result, :scope, req, variables: vars, tid: self.id
       when :variable
         vid = args.shift
         obj = @var_map[vid]
@@ -837,10 +867,11 @@ module DEBUGGER__
               }
             when String
               vars = [
-                variable('#length', obj.length),
+                variable('#lengthddsfsd', obj.length),
                 variable('#encoding', obj.encoding),
               ]
-              vars << variable('#dump', NaiveString.new(obj)) if obj.length > MAX_LENGTH
+              printed_str = value_inspect(obj)
+              vars << variable('#dump', NaiveString.new(obj)) if printed_str.end_with?('...')
             when Class, Module
               vars << variable('%ancestors', obj.ancestors[1..])
             when Range
@@ -858,7 +889,7 @@ module DEBUGGER__
             end
           end
         end
-        event! :dap_result, :variable, req, variables: (vars || []), tid: self.id
+        event! :protocol_result, :variable, req, variables: (vars || []), tid: self.id
 
       when :evaluate
         fid, expr, context = args
@@ -872,12 +903,7 @@ module DEBUGGER__
 
           case context
           when 'repl', 'watch'
-            begin
-              result = b.eval(expr.to_s, '(DEBUG CONSOLE)')
-            rescue Exception => e
-              result = e
-            end
-
+            result = dap_eval b, expr, context, prompt: '(DEBUG CONSOLE)'
           when 'hover'
             case expr
             when /\A\@\S/
@@ -887,7 +913,7 @@ module DEBUGGER__
                 message = "Error: Not defined instance variable: #{expr.inspect}"
               end
             when /\A\$\S/
-              global_variables.each{|gvar|
+              safe_global_variables.each{|gvar|
                 if gvar.to_s == expr
                   result = eval(gvar.to_s)
                   break false
@@ -918,7 +944,7 @@ module DEBUGGER__
           result = 'Error: Can not evaluate on this frame'
         end
 
-        event! :dap_result, :evaluate, req, message: message, tid: self.id, **evaluate_result(result)
+        event! :protocol_result, :evaluate, req, message: message, tid: self.id, **evaluate_result(result)
 
       when :completions
         fid, text = args
@@ -928,7 +954,7 @@ module DEBUGGER__
           words = IRB::InputCompletor::retrieve_completion_data(word, bind: b).compact
         end
 
-        event! :dap_result, :completions, req, targets: (words || []).map{|phrase|
+        event! :protocol_result, :completions, req, targets: (words || []).map{|phrase|
           detail = nil
 
           if /\b([_a-zA-Z]\w*[!\?]?)\z/ =~ phrase
@@ -951,7 +977,11 @@ module DEBUGGER__
         }
 
       else
-        raise "Unknown req: #{args.inspect}"
+        if respond_to? mid = "custom_dap_request_#{type}"
+          __send__ mid, req
+        else
+          raise "Unknown request: #{args.inspect}"
+        end
       end
     end
 

data/lib/debug/session.rb

@@ -128,16 +128,16 @@ module DEBUGGER__
       @obj_map = {} # { object_id => ... } for CDP
 
       @tp_thread_begin = nil
+      @tp_thread_end = nil
+
       @commands = {}
       @unsafe_context = false
 
-      has_keep_script_lines = RubyVM.respond_to? :keep_script_lines
+      @has_keep_script_lines = RubyVM.respond_to? :keep_script_lines
 
       @tp_load_script = TracePoint.new(:script_compiled){|tp|
-        if !has_keep_script_lines || bps_pending_until_load?
-          eval_script = tp.eval_script unless has_keep_script_lines
-          ThreadClient.current.on_load tp.instruction_sequence, eval_script
-        end
+        eval_script = tp.eval_script unless @has_keep_script_lines
+        ThreadClient.current.on_load tp.instruction_sequence, eval_script
       }
       @tp_load_script.enable
 
@@ -169,12 +169,17 @@ module DEBUGGER__
       @ui = ui if ui
 
       @tp_thread_begin&.disable
+      @tp_thread_end&.disable
       @tp_thread_begin = nil
-
+      @tp_thread_end = nil
       @ui.activate self, on_fork: on_fork
 
       q = Queue.new
+      first_q = Queue.new
       @session_server = Thread.new do
+        # make sure `@session_server` is assigned
+        first_q.pop; first_q = nil
+
         Thread.current.name = 'DEBUGGER__::SESSION@server'
         Thread.current.abort_on_exception = true
 
@@ -192,10 +197,16 @@ module DEBUGGER__
         end
         @tp_thread_begin.enable
 
+        @tp_thread_end = TracePoint.new(:thread_end) do |tp|
+          @th_clients.delete(Thread.current)
+        end
+        @tp_thread_end.enable
+
         # session start
         q << true
         session_server_main
       end
+      first_q << :ok
 
       q.pop
     end
@@ -205,6 +216,7 @@ module DEBUGGER__
       @thread_stopper.disable
       @tp_load_script.disable
       @tp_thread_begin.disable
+      @tp_thread_end.disable
       @bps.each_value{|bp| bp.disable}
       @th_clients.each_value{|thc| thc.close}
       @tracers.values.each{|t| t.disable}
@@ -219,11 +231,13 @@ module DEBUGGER__
 
       # activate new ui
       @tp_thread_begin.disable
+      @tp_thread_end.disable
       @ui.activate self
       if @ui.respond_to?(:reader_thread) && thc = get_thread_client(@ui.reader_thread)
         thc.mark_as_management
       end
       @tp_thread_begin.enable
+      @tp_thread_end.enable
     end
 
     def pop_event
@@ -329,16 +343,13 @@ module DEBUGGER__
           opt = ev_args[3]
           add_tracer ObjectTracer.new(@ui, obj_id, obj_inspect, **opt)
         else
-          # ignore
+          stop_all_threads
         end
 
         wait_command_loop
 
-      when :dap_result
-        dap_event ev_args # server.rb
-        wait_command_loop
-      when :cdp_result
-        cdp_event ev_args
+      when :protocol_result
+        process_protocol_result ev_args
         wait_command_loop
       end
     end
@@ -480,9 +491,9 @@ module DEBUGGER__
       # * `u[ntil]`
       #   * Similar to `next` command, but only stop later lines or the end of the current frame.
       #   * Similar to gdb's `advance` command.
-      # * `u[ntil] <[file:]line>
+      # * `u[ntil] <[file:]line>`
       #   * Run til the program reaches given location or the end of the current frame.
-      # * `u[ntil] <name>
+      # * `u[ntil] <name>`
       #   * Run til the program invokes a method `<name>`. `<name>` can be a regexp with `/name/`.
       register_command 'u', 'until',
                        repeat: true,
@@ -889,13 +900,13 @@ module DEBUGGER__
       # * `p <expr>`
       #   * Evaluate like `p <expr>` on the current frame.
       register_command 'p' do |arg|
-        request_tc [:eval, :p, arg.to_s]
+        request_eval :p, arg.to_s
       end
 
       # * `pp <expr>`
       #   * Evaluate like `pp <expr>` on the current frame.
       register_command 'pp' do |arg|
-        request_tc [:eval, :pp, arg.to_s]
+        request_eval :pp, arg.to_s
       end
 
       # * `eval <expr>`
@@ -906,7 +917,7 @@ module DEBUGGER__
           @ui.puts "\nTo evaluate the variable `#{cmd}`, use `pp #{cmd}` instead."
           :retry
         else
-          request_tc [:eval, :call, arg]
+          request_eval :call, arg
         end
       end
 
@@ -917,7 +928,7 @@ module DEBUGGER__
           @ui.puts "not supported on the remote console."
           :retry
         end
-        request_tc [:eval, :irb]
+        request_eval :irb, nil
       end
 
       ### Trace
@@ -1137,7 +1148,7 @@ module DEBUGGER__
         @repl_prev_line = nil
         check_unsafe
 
-        request_tc [:eval, :pp, line]
+        request_eval :pp, line
       end
 
     rescue Interrupt
@@ -1153,6 +1164,11 @@ module DEBUGGER__
       return :retry
     end
 
+    def request_eval type, src
+      restart_all_threads
+      request_tc [:eval, type, src]
+    end
+
     def step_command type, arg
       if type == :until
         leave_subsession [:step, type, arg]
@@ -1321,10 +1337,6 @@ module DEBUGGER__
 
     # breakpoint management
 
-    def bps_pending_until_load?
-      @bps.any?{|key, bp| bp.pending_until_load?}
-    end
-
     def iterate_bps
       deleted_bps = []
       i = 0
@@ -1500,7 +1512,7 @@ module DEBUGGER__
     def clear_line_breakpoints path
       path = resolve_path(path)
       clear_breakpoints do |k, bp|
-        bp.is_a?(LineBreakpoint) && DEBUGGER__.compare_path(k.first, path)
+        bp.is_a?(LineBreakpoint) && bp.path_is?(path)
       end
     rescue Errno::ENOENT
       # just ignore
@@ -1524,7 +1536,7 @@ module DEBUGGER__
     # tracers
 
     def add_tracer tracer
-      if @tracers.has_key? tracer.key
+      if @tracers[tracer.key]&.enabled?
         tracer.disable
         @ui.puts "Duplicated tracer: #{tracer}"
       else
@@ -1724,25 +1736,26 @@ module DEBUGGER__
       file_path, reloaded = @sr.add(iseq, src)
       @ui.event :load, file_path, reloaded
 
-      pending_line_breakpoints = @bps.find_all do |key, bp|
-        LineBreakpoint === bp && !bp.iseq
-      end
-
-      pending_line_breakpoints.each do |_key, bp|
-        if DEBUGGER__.compare_path(bp.path, (iseq.absolute_path || iseq.path))
-          bp.try_activate iseq
-        end
-      end
-
-      if reloaded
-        @bps.find_all do |key, bp|
-          LineBreakpoint === bp && DEBUGGER__.compare_path(bp.path, file_path)
+      # check breakpoints
+      if file_path
+        @bps.find_all do |_key, bp|
+          LineBreakpoint === bp && bp.path_is?(file_path)
         end.each do |_key, bp|
-          @bps.delete bp.key # to allow duplicate
-          if nbp = LineBreakpoint.copy(bp, iseq)
-            add_bp nbp
+          if !bp.iseq
+            bp.try_activate iseq
+          elsif reloaded
+            @bps.delete bp.key # to allow duplicate
+            if nbp = LineBreakpoint.copy(bp, iseq)
+              add_bp nbp
+            end
           end
         end
+      else # !file_path => file_path is not existing
+        @bps.find_all do |_key, bp|
+          LineBreakpoint === bp && !bp.iseq && DEBUGGER__.compare_path(bp.path, (iseq.absolute_path || iseq.path))
+        end.each do |_key, bp|
+          bp.try_activate iseq
+        end
       end
     end
 
@@ -2438,7 +2451,7 @@ module DEBUGGER__
     end
 
     module DaemonInterceptor
-      def daemon
+      def daemon(*args)
         return super unless defined?(SESSION) && SESSION.active?
 
         _, child_hook = __fork_setup_for_debugger(:child)

data/lib/debug/source_repository.rb

@@ -34,7 +34,7 @@ module DEBUGGER__
       end
 
       def add iseq, src
-        # do nothing
+        # only manage loaded file names
         if (path = (iseq.absolute_path || iseq.path)) && File.exist?(path)
           if @loaded_file_map.has_key? path
             return path, true # reloaded
@@ -49,7 +49,7 @@ module DEBUGGER__
         lines = iseq.script_lines&.map(&:chomp)
         line = iseq.first_line
         if line > 1
-          lines = [*([''] * (line - 1)), *lines]
+          [*([''] * (line - 1)), *lines]
         else
           lines
         end

data/lib/debug/thread_client.rb

@@ -29,7 +29,7 @@ module DEBUGGER__
     end
 
     def skip_internal_path?(path)
-      path.start_with?(__dir__) || path.start_with?('<internal:')
+      path.start_with?(__dir__) || path.delete_prefix('!eval:').start_with?('<internal:')
     end
 
     def skip_location?(loc)
@@ -38,6 +38,13 @@ module DEBUGGER__
     end
   end
 
+  module GlobalVariablesHelper
+    SKIP_GLOBAL_LIST = %i[$= $KCODE $-K $SAFE].freeze
+    def safe_global_variables
+      global_variables.reject{|name| SKIP_GLOBAL_LIST.include? name }
+    end
+  end
+
   class ThreadClient
     def self.current
       if thc = Thread.current[:DEBUGGER__ThreadClient]
@@ -50,6 +57,7 @@ module DEBUGGER__
 
     include Color
     include SkipPathHelper
+    include GlobalVariablesHelper
 
     attr_reader :thread, :id, :recorder, :check_bp_fulfillment_map
 
@@ -636,9 +644,8 @@ module DEBUGGER__
       end
     end
 
-    SKIP_GLOBAL_LIST = %i[$= $KCODE $-K $SAFE].freeze
     def show_globals pat
-      global_variables.sort.each{|name|
+      safe_global_variables.sort.each{|name|
         next if SKIP_GLOBAL_LIST.include? name
 
         value = eval(name.to_s)
@@ -1223,7 +1230,15 @@ module DEBUGGER__
     rescue SuspendReplay, SystemExit, Interrupt
       raise
     rescue Exception => e
-      pp ["DEBUGGER Exception: #{__FILE__}:#{__LINE__}", e, e.backtrace]
+      STDERR.puts e.cause.inspect
+      STDERR.puts e.inspect
+      Thread.list.each{|th|
+        STDERR.puts "@@@ #{th}"
+        th.backtrace.each{|b|
+          STDERR.puts " > #{b}"
+        }
+      }
+      p ["DEBUGGER Exception: #{__FILE__}:#{__LINE__}", e, e.backtrace]
       raise
     ensure
       @returning = false

data/lib/debug/tracer.rb

@@ -54,6 +54,10 @@ module DEBUGGER__
       @tracer.disable
     end
 
+    def enabled?
+      @tracer.enabled?
+    end
+
     def description
       nil
     end
@@ -85,11 +89,6 @@ module DEBUGGER__
       end
     end
 
-    def puts msg
-      @output.puts msg
-      @output.flush
-    end
-
     def minfo tp
       return "block{}" if tp.event == :b_call
 

data/lib/debug/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DEBUGGER__
-  VERSION = "1.7.0"
+  VERSION = "1.7.2"
 end

data/misc/README.md.erb

@@ -26,7 +26,7 @@ New debug.rb has several advantages:
   * Support threads (almost done) and ractors (TODO).
   * Support suspending and entering to the console debugging with `Ctrl-C` at most of timing.
   * Show parameters on backtrace command.
-  * Support recording & reply debugging.
+  * Support recording & replay debugging.
 
 # Installation
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debug
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Koichi Sasada
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb