readapt 0.7.1 → 1.1.1

data/lib/readapt/breakpoint.rb

@@ -1,13 +1,20 @@
-module Readapt
-  class Breakpoint
-    attr_reader :source
-    attr_reader :line
-    attr_reader :condition
-
-    def initialize source, line, condition
-      @source = source
-      @line = line
-      @condition = condition
-    end
-  end
-end
+module Readapt
+  class Breakpoint
+    attr_reader :source
+    attr_reader :line
+    attr_reader :condition
+    attr_reader :hit_condition
+    attr_writer :hit_cursor
+
+    def initialize source, line, condition, hit_condition
+      @source = source
+      @line = line
+      @condition = condition
+      @hit_condition = hit_condition
+    end
+
+    def hit_cursor
+      @hit_cursor ||= 0
+    end
+  end
+end

data/lib/readapt/data_reader.rb

@@ -0,0 +1,62 @@
+module Readapt
+  class DataReader
+    def initialize
+      @in_header = true
+      @content_length = 0
+      @buffer = String.new
+    end
+
+    # Declare a block to be executed for each message received from the
+    # client.
+    #
+    # @yieldparam [Hash] The message received from the client
+    def set_message_handler &block
+      @message_handler = block
+    end
+
+    # Process raw data received from the client. The data will be parsed
+    # into messages based on the JSON-RPC protocol. Each message will be
+    # passed to the block declared via set_message_handler. Incomplete data
+    # will be buffered and subsequent data will be appended to the buffer.
+    #
+    # @param data [String]
+    def receive data
+      data.each_char do |char|
+        @buffer.concat char
+        if @in_header
+          prepare_to_parse_message if @buffer.end_with?("\r\n\r\n")
+        else
+          parse_message_from_buffer if @buffer.bytesize == @content_length
+        end
+      end
+    end
+
+    private
+
+    def prepare_to_parse_message
+      @in_header = false
+      @buffer.each_line do |line|
+        parts = line.split(':').map(&:strip)
+        if parts[0] == 'Content-Length'
+          @content_length = parts[1].to_i
+          break
+        end
+      end
+      @buffer.clear
+    end
+
+    def parse_message_from_buffer
+      begin
+        msg = JSON.parse(@buffer)
+        @message_handler.call msg unless @message_handler.nil?
+      rescue JSON::ParserError => e
+        Solargraph::Logging.logger.warn "Failed to parse request: #{e.message}"
+        Solargraph::Logging.logger.debug "Buffer: #{@buffer}"
+      ensure
+        @buffer.clear
+        @in_header = true
+        @content_length = 0
+      end
+    end
+  end
+end

data/lib/readapt/debugger.rb

@@ -1,204 +1,220 @@
-# frozen_string_literal: true
-
-require 'backport'
-require 'observer'
-require 'set'
-
-module Readapt
-  class Debugger
-    include Observable
-    include Finder
-
-    attr_reader :monitor
-
-    attr_reader :file
-
-    def initialize machine = Machine.new
-      @stack = []
-      @threads = {}
-      @frames = {}
-      @running = false
-      @attached = false
-      @request = nil
-      @config = {}
-      @original_argv = ARGV.clone
-      @original_prog = $0
-      @machine = machine
-      @breakpoints = {}
-    end
-
-    def config arguments, request
-      @file = Readapt.normalize_path(find(arguments['program']))
-      @config = arguments
-      @request = request
-    rescue LoadError => e
-      STDERR.puts e.message
-    end
-
-    # @return [Readapt::Thread]
-    def thread id
-      @threads[id] || Thread::NULL_THREAD
-    end
-
-    def threads
-      @threads.values
-    end
-
-    def frame id
-      @frames[id] || Frame::NULL_FRAME
-    end
-
-    def launched?
-      @request == :launch
-    end
-
-    def attached?
-      @request == :attach
-    end
-
-    def start
-      ::Thread.new do
-        run { load @file }
-      end
-    end
-
-    def run
-      # raise RuntimeError, 'Debugger is already running' if @running
-      set_program_args
-      @running = true
-      send_event('process', {
-        name: @file
-      })
-      Monitor.start @file do |snapshot|
-        debug snapshot
-      end
-      yield if block_given?
-    rescue StandardError => e
-      STDERR.puts e.message
-      STDERR.puts e.backtrace.join("\n")
-    rescue SystemExit
-      # Ignore
-    ensure
-      Monitor.stop
-      @running = false
-      set_original_args
-      changed
-      send_event 'terminated', nil
-    end
-
-    def output data, category = :console
-      send_event('output', {
-        output: data,
-        category: category
-      })
-    end
-
-    def get_breakpoint source, line
-      @breakpoints["#{source}:#{line}"] || Breakpoint.new(source, line, nil)
-    end
-
-    def set_breakpoint source, line, condition
-      @breakpoints["#{source}:#{line}"] = Breakpoint.new(source, line, condition)
-    end
-
-    def clear_breakpoints source
-      @breakpoints.delete_if { |key, value|
-        value.source == source
-      }
-    end
-
-    def disconnect
-      shutdown if launched?
-      @request = nil
-    end
-
-    def self.run &block
-      new.run &block
-    end
-
-    private
-
-    # @param [Snapshot]
-    # return [void]
-    def debug snapshot
-      if snapshot.event == :thread_begin || snapshot.event == :entry
-        @threads[snapshot.thread_id] ||= Thread.new(snapshot.thread_id)
-        thr = @threads[snapshot.thread_id]
-        thr.control = :continue
-        send_event('thread', {
-          reason: 'started',
-          threadId: snapshot.thread_id
-        }, true)
-        snapshot.control = :continue
-      elsif snapshot.event == :thread_end
-        thr = thread(snapshot.thread_id)
-        thr.control = :continue
-        @threads.delete snapshot.thread_id
-        send_event('thread', {
-          reason: 'exited',
-          threadId: snapshot.thread_id
-        })
-        snapshot.control = :continue
-      # elsif snapshot.event == :entry
-      #   snapshot.control = :continue
-      else
-        if snapshot.event == :breakpoint
-          bp = get_breakpoint(snapshot.file, snapshot.line)
-          unless bp.condition.nil? || bp.condition.empty?
-            # @type [Binding]
-            bnd = ObjectSpace._id2ref(snapshot.binding_id)
-            begin
-              unless bnd.eval(bp.condition)
-                snapshot.control = :continue
-                return
-              end
-            rescue Exception => e
-              STDERR.puts "Breakpoint condition raised an error"
-              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
-              STDERR.puts "[#{e.class}] #{e.message}"
-              snapshot.control = :continue
-              return
-            end
-          end
-        end
-        changed
-        thread = self.thread(snapshot.thread_id)
-        thread.control = :pause
-        frame = Frame.new(Location.new(snapshot.file, snapshot.line), snapshot.binding_id)
-        thread.frames.push frame
-        @frames[frame.local_id] = frame
-        send_event('stopped', {
-          reason: snapshot.event,
-          threadId: ::Thread.current.object_id
-        })
-        sleep 0.01 until thread.control != :pause || !@threads.key?(thread.id)
-        @frames.delete frame.local_id
-        thread.frames.delete frame
-        snapshot.control = thread.control
-      end
-    end
-
-    def set_program_args
-      $0 = file
-      ARGV.clear
-      ARGV.replace(@config['programArgs'] || [])
-    end
-
-    def set_original_args
-      $0 = @original_prog
-      ARGV.clear
-      ARGV.replace @original_argv
-    end
-
-    def shutdown
-      @machine.stop
-      exit
-    end
-
-    def send_event event, data, wait = false
-      changed
-      notify_observers event, data
-      sleep 0.01 if wait
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'backport'
+require 'observer'
+require 'set'
+
+module Readapt
+  class Debugger
+    include Observable
+    include Finder
+
+    attr_reader :monitor
+
+    attr_reader :file
+
+    def initialize
+      @stack = []
+      @frames = {}
+      @running = false
+      @attached = false
+      @request = nil
+      @config = {}
+      @original_argv = ARGV.clone
+      @original_prog = $0
+      @breakpoints = {}
+    end
+
+    def config arguments, request
+      @file = Readapt.normalize_path(find(arguments['program']))
+      @config = arguments
+      @request = request
+    rescue LoadError => e
+      STDERR.puts e.message
+    end
+
+    # @return [Readapt::Thread]
+    def thread id
+      Thread.find(id)
+    end
+
+    def threads
+      Thread.all
+    end
+
+    def frame id
+      @frames[id] || Frame::NULL_FRAME
+    end
+
+    def launched?
+      @request == :launch
+    end
+
+    def attached?
+      @request == :attach
+    end
+
+    def start
+      ::Thread.new do
+        set_program_args
+        run { load @file }
+        set_original_args
+      end
+    end
+
+    def run
+      # raise RuntimeError, 'Debugger is already running' if @running
+      @running = true
+      send_event('process', {
+        name: @file
+      })
+      Monitor.start @file do |snapshot|
+        debug snapshot
+      end
+      yield if block_given?
+    rescue StandardError => e
+      STDERR.puts "[#{e.class}] #{e.message}"
+      STDERR.puts e.backtrace.join("\n")
+    ensure
+      Monitor.stop
+      @running = false
+      STDOUT.flush #unless STDOUT.closed?
+      STDERR.flush #unless STDERR.closed?
+      changed
+      send_event 'terminated', nil
+    end
+
+    def output data, category = :console
+      send_event('output', {
+        output: data,
+        category: category
+      })
+    end
+
+    def get_breakpoint source, line
+      @breakpoints["#{source}:#{line}"] || Breakpoint.new(source, line, nil, 0)
+    end
+
+    def set_breakpoint source, line, condition, hitcount
+      @breakpoints["#{source}:#{line}"] = Breakpoint.new(source, line, condition, hitcount)
+    end
+
+    def clear_breakpoints source
+      @breakpoints.delete_if { |_key, value|
+        value.source == source
+      }
+    end
+
+    def disconnect
+      shutdown if launched?
+      @request = nil
+    end
+
+    def self.run &block
+      new.run &block
+    end
+
+    private
+
+    # @param [Snapshot]
+    # return [void]
+    def debug snapshot
+      sleep 0.001 # @todo Trying to let thread data sync
+      References.clear
+      if snapshot.event == :thread_begin || snapshot.event == :entry
+        thr = Thread.find(snapshot.thread_id)
+        thr.control = :continue
+        send_event('thread', {
+          reason: 'started',
+          threadId: snapshot.thread_id
+        }, true)
+        snapshot.control = :continue
+      elsif snapshot.event == :thread_end
+        thr = thread(snapshot.thread_id)
+        thr.control = :continue
+        send_event('thread', {
+          reason: 'exited',
+          threadId: snapshot.thread_id
+        })
+        snapshot.control = :continue
+      else
+        confirmed_pause = true
+        thread = self.thread(snapshot.thread_id)
+        if snapshot.event == :breakpoint
+          bp = get_breakpoint(snapshot.file, snapshot.line)
+          unless bp.condition.nil? || bp.condition.empty?
+            # @type [Binding]
+            bnd = thread.frames.first.frame_binding
+            begin
+              unless bnd.eval(bp.condition)
+                confirmed_pause = false
+              end
+            rescue Exception => e
+              STDERR.puts "Breakpoint condition raised an error"
+              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
+              STDERR.puts "[#{e.class}] #{e.message}"
+              confirmed_pause = false
+            end
+          end
+          unless !confirmed_pause || bp.hit_condition.nil? || bp.hit_condition.empty?
+            bp.hit_cursor += 1
+            bnd = thread.frames.first.frame_binding
+            begin
+              hit_count = bnd.eval(bp.hit_condition)
+              if bp.hit_cursor == hit_count
+                bp.hit_cursor = 0
+              else
+                confirmed_pause = false
+              end
+            rescue Exception => e
+              STDERR.puts "Breakpoint condition raised an error"
+              STDERR.puts "#{snapshot.file}:#{snapshot.line} - `#{bp.condition}`"
+              STDERR.puts "[#{e.class}] #{e.message}"
+              confirmed_pause = false
+            end
+          end
+        end
+        if confirmed_pause
+          changed
+          thread.control = :pause
+          thread.frames.each do |frm|
+            @frames[frm.local_id] = frm
+          end
+          send_event('stopped', {
+            reason: snapshot.event,
+            threadId: thread.id
+          })
+          sleep 0.01 until thread.control != :pause || !Thread.include?(thread.id)
+          thread.frames.each do |frm|
+            @frames.delete frm.local_id
+          end
+        else
+          thread.control = :continue
+        end
+        snapshot.control = thread.control
+      end
+    end
+
+    def set_program_args
+      $0 = file
+      ARGV.clear
+      ARGV.replace(@config['programArgs'] || [])
+    end
+
+    def set_original_args
+      $0 = @original_prog
+      ARGV.clear
+      ARGV.replace @original_argv
+    end
+
+    def shutdown
+      exit
+    end
+
+    def send_event event, data, wait = false
+      changed
+      notify_observers event, data
+      sleep 0.01 if wait
+    end
+  end
+end