debug 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d08935b209386adbc7a1172ae0d43feb7bf31c9483aa177946fa0669db69e8
-  data.tar.gz: '01917758f048b2927a6e42b8965985477fed13011b3cd7626220ea8d1aad42fd'
+  metadata.gz: a84e87e9582c98cf24ca8aa9f1f30032c10736bf4dbc1c44da016db564a7a574
+  data.tar.gz: da093ef6ebfd8fc5e4a10fcc39c59826e45829ec09da0d9dc164b9cd71085286
 SHA512:
-  metadata.gz: 6381058fe16c43d79afdc04db1dcfcff6bd3c65216ce9bc9a03b02c26dbe098011879128c2e4f3ed31b1f7cf279b590fd641b4030f6cb6308434d65d17e51110
-  data.tar.gz: c2896cca900dea7f5f4456b30f8dc4ecbed6886da74c46033e82bcda37da561759f2bd3b9a702eef7603785c17989f437b4f186817ad458edd16371c7b879688
+  metadata.gz: d663b6db0dba8921aaaa535f834e768367e07fef03613e6a277a27724fb75ecf830c7557465521998d42cbb41744e6335495958f626285468d6e38ae6ec52515
+  data.tar.gz: cb24e62c5875c069812ff1b056dda3b912a20069d09123b72dbd0da69e61aed66968bc4dc5f80e9b599df743fb7755a2399f1461f344fc43ed9ea6bbf20f251c

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/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_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
@@ -696,6 +699,8 @@ module DEBUGGER__
   end
 
   class Session
+    include GlobalVariablesHelper
+
     # FIXME: unify this method with ThreadClient#propertyDescriptor.
     def get_type obj
       case obj
@@ -750,7 +755,7 @@ module DEBUGGER__
             fid = @frame_map[frame_id]
             request_tc [:cdp, :scope, req, fid]
           when 'global'
-            vars = global_variables.sort.map do |name|
+            vars = safe_global_variables.sort.map do |name|
               gv = eval(name.to_s)
               prop = {
                 name: name,
@@ -1040,7 +1045,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

data/lib/debug/server_dap.rb

@@ -452,7 +452,11 @@ module DEBUGGER__
           @q_msg << req
 
         else
-          raise "Unknown request: #{req.inspect}"
+          if respond_to? mid = "request_#{req['command']}"
+            send mid, req
+          else
+            raise "Unknown request: #{req.inspect}"
+          end
         end
       end
     ensure
@@ -516,6 +520,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?
@@ -562,8 +568,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,
@@ -721,9 +731,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 +744,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
@@ -800,7 +817,7 @@ module DEBUGGER__
           name: 'Global variables',
           presentationHint: 'globals',
           variablesReference: 1, # GLOBAL
-          namedVariables: global_variables.size,
+          namedVariables: safe_global_variables.size,
           indexedVariables: 0,
           expensive: false,
         }]
@@ -837,10 +854,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
@@ -872,12 +890,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 +900,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

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)

data/lib/debug/version.rb

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

metadata

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