debug 1.4.0 → 1.5.0

data/lib/debug/server_cdp.rb

@@ -27,7 +27,7 @@ module DEBUGGER__
         ws_client.handshake port, path
         ws_client.send id: 1, method: 'Target.getTargets'
 
-        4.times do
+        loop do
           res = ws_client.extract_data
           case
           when res['id'] == 1 && target_info = res.dig('result', 'targetInfos')
@@ -39,12 +39,23 @@ module DEBUGGER__
                           }
           when res['id'] == 2
             s_id = res.dig('result', 'sessionId')
-            sleep 0.1
-            ws_client.send sessionId: s_id, id: 1,
+            ws_client.send sessionId: s_id, id: 3,
+                          method: 'Page.enable'
+          when res['id'] == 3
+            s_id = res['sessionId']
+            ws_client.send sessionId: s_id, id: 4,
+                          method: 'Page.getFrameTree'
+          when res['id'] == 4
+            s_id = res['sessionId']
+            f_id = res.dig('result', 'frameTree', 'frame', 'id')
+            ws_client.send sessionId: s_id, id: 5,
                           method: 'Page.navigate',
                           params: {
-                            url: "devtools://devtools/bundled/inspector.html?ws=#{addr}"
+                            url: "devtools://devtools/bundled/inspector.html?v8only=true&panel=sources&ws=#{addr}/#{SecureRandom.uuid}",
+                            frameId: f_id
                           }
+          when res['method'] == 'Page.loadEventFired'
+            break
           end
         end
         pid
@@ -91,16 +102,57 @@ module DEBUGGER__
       end
     end
 
+    module WebSocketUtils
+      class Frame
+        attr_reader :b
+
+        def initialize
+          @b = ''.b
+        end
+
+        def << obj
+          case obj
+          when String
+            @b << obj.b
+          when Enumerable
+            obj.each{|e| self << e}
+          end
+        end
+
+        def char bytes
+          @b << bytes
+        end
+
+        def ulonglong bytes
+          @b << [bytes].pack('Q>')
+        end
+
+        def uint16 bytes
+          @b << [bytes].pack('n*')
+        end
+      end
+
+      def show_protocol dir, msg
+        if DEBUGGER__::UI_CDP::SHOW_PROTOCOL
+          $stderr.puts "\#[#{dir}] #{msg}"
+        end
+      end
+    end
+
     class WebSocketClient
+      include WebSocketUtils
+
       def initialize s
         @sock = s
       end
 
       def handshake port, path
         key = SecureRandom.hex(11)
-        @sock.print "GET #{path} HTTP/1.1\r\nHost: 127.0.0.1:#{port}\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: #{key}==\r\n\r\n"
+        req = "GET #{path} HTTP/1.1\r\nHost: 127.0.0.1:#{port}\r\nConnection: Upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: #{key}==\r\n\r\n"
+        show_protocol :>, req
+        @sock.print req
         res = @sock.readpartial 4092
-        $stderr.puts '[>]' + res if SHOW_PROTOCOL
+        show_protocol :<, res
 
         if res.match /^Sec-WebSocket-Accept: (.*)\r\n/
           correct_key = Base64.strict_encode64 Digest::SHA1.digest "#{key}==258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
@@ -112,34 +164,39 @@ module DEBUGGER__
 
       def send **msg
         msg = JSON.generate(msg)
-        frame = []
+        show_protocol :>, msg
+        frame = Frame.new
         fin = 0b10000000
         opcode = 0b00000001
-        frame << fin + opcode
+        frame.char fin + opcode
 
         mask = 0b10000000 # A client must mask all frames in a WebSocket Protocol.
         bytesize = msg.bytesize
         if bytesize < 126
           payload_len = bytesize
+          frame.char mask + payload_len
         elsif bytesize < 2 ** 16
           payload_len = 0b01111110
-          ex_payload_len = [bytesize].pack('n*').bytes
-        else
+          frame.char mask + payload_len
+          frame.uint16 bytesize
+        elsif bytesize < 2 ** 64
           payload_len = 0b01111111
-          ex_payload_len = [bytesize].pack('Q>').bytes
+          frame.char mask + payload_len
+          frame.ulonglong bytesize
+        else
+          raise 'Bytesize is too big.'
         end
 
-        frame << mask + payload_len
-        frame.push *ex_payload_len if ex_payload_len
-
-        frame.push *masking_key = 4.times.map{rand(1..255)}
-        masked = []
+        masking_key = 4.times.map{
+          key = rand(1..255)
+          frame.char key
+          key
+        }
         msg.bytes.each_with_index do |b, i|
-          masked << (b ^ masking_key[i % 4])
+          frame.char(b ^ masking_key[i % 4])
         end
 
-        frame.push *masked
-        @sock.print frame.pack 'c*'
+        @sock.print frame.b
       end
 
       def extract_data
@@ -158,9 +215,9 @@ module DEBUGGER__
           payload_len = @sock.read(2).unpack('n*')[0]
         end
 
-        data = JSON.parse @sock.read payload_len
-        $stderr.puts '[>]' + data.inspect if SHOW_PROTOCOL
-        data
+        msg = @sock.read payload_len
+        show_protocol :<, msg
+        JSON.parse msg
       end
     end
 
@@ -168,17 +225,21 @@ module DEBUGGER__
     end
 
     class WebSocketServer
+      include WebSocketUtils
+
       def initialize s
         @sock = s
       end
 
       def handshake
         req = @sock.readpartial 4096
-        $stderr.puts '[>]' + req if SHOW_PROTOCOL
+        show_protocol '>', req
 
         if req.match /^Sec-WebSocket-Key: (.*)\r\n/
           accept = Base64.strict_encode64 Digest::SHA1.digest "#{$1}258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-          @sock.print "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: #{accept}\r\n\r\n"
+          res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: #{accept}\r\n\r\n"
+          @sock.print res
+          show_protocol :<, res
         else
           "Unknown request: #{req}"
         end
@@ -186,27 +247,31 @@ module DEBUGGER__
 
       def send **msg
         msg = JSON.generate(msg)
-        frame = []
+        show_protocol :<, msg
+        frame = Frame.new
         fin = 0b10000000
         opcode = 0b00000001
-        frame << fin + opcode
+        frame.char fin + opcode
 
         mask = 0b00000000 # A server must not mask any frames in a WebSocket Protocol.
         bytesize = msg.bytesize
         if bytesize < 126
           payload_len = bytesize
+          frame.char mask + payload_len
         elsif bytesize < 2 ** 16
           payload_len = 0b01111110
-          ex_payload_len = [bytesize].pack('n*').bytes
-        else
+          frame.char mask + payload_len
+          frame.uint16 bytesize
+        elsif bytesize < 2 ** 64
           payload_len = 0b01111111
-          ex_payload_len = [bytesize].pack('Q>').bytes
+          frame.char mask + payload_len
+          frame.ulonglong bytesize
+        else
+          raise 'Bytesize is too big.'
         end
 
-        frame << mask + payload_len
-        frame.push *ex_payload_len if ex_payload_len
-        frame.push *msg.bytes
-        @sock.print frame.pack 'c*'
+        frame << msg
+        @sock.print frame.b
       end
 
       def extract_data
@@ -234,7 +299,9 @@ module DEBUGGER__
           masked = @sock.getbyte
           unmasked << (masked ^ masking_key[n % 4])
         end
-        JSON.parse unmasked.pack 'c*'
+        msg = unmasked.pack 'c*'
+        show_protocol :>, msg
+        JSON.parse msg
       end
     end
 
@@ -265,63 +332,46 @@ module DEBUGGER__
       @src_map = {}
       loop do
         req = @ws_server.extract_data
-        $stderr.puts '[>]' + req.inspect if SHOW_PROTOCOL
 
         case req['method']
 
         ## boot/configuration
-        when 'Page.getResourceTree'
-          path = File.absolute_path($0)
-          src = File.read(path)
-          @src_map[path] = src
-          send_response req,
-                        frameTree: {
-                          frame: {
-                            id: SecureRandom.hex(16),
-                            loaderId: SecureRandom.hex(16),
-                            url: 'http://debuggee/',
-                            securityOrigin: 'http://debuggee',
-                            mimeType: 'text/plain' },
-                          resources: [
-                          ]
-                        }
-          send_event 'Debugger.scriptParsed',
-                      scriptId: path,
-                      url: "http://debuggee#{path}",
-                      startLine: 0,
-                      startColumn: 0,
-                      endLine: src.count("\n"),
-                      endColumn: 0,
-                      executionContextId: 1,
-                      hash: src.hash
+        when 'Debugger.getScriptSource'
+          @q_msg << req
+        when 'Debugger.enable'
+          send_response req
+          @q_msg << req
+        when 'Runtime.enable'
+          send_response req
           send_event 'Runtime.executionContextCreated',
                       context: {
                         id: SecureRandom.hex(16),
                         origin: "http://#{@addr}",
                         name: ''
                       }
-        when 'Debugger.getScriptSource'
-          s_id = req.dig('params', 'scriptId')
-          src = get_source_code s_id
-          send_response req, scriptSource: src
-          @q_msg << req
+        when 'Runtime.getIsolateId'
+          send_response req,
+                        id: SecureRandom.hex
+        when 'Runtime.terminateExecution'
+          send_response req
+          exit
         when 'Page.startScreencast', 'Emulation.setTouchEmulationEnabled', 'Emulation.setEmitTouchEventsForMouse',
           'Runtime.compileScript', 'Page.getResourceContent', 'Overlay.setPausedInDebuggerMessage',
-          'Runtime.releaseObjectGroup', 'Runtime.discardConsoleEntries', 'Log.clear'
+          'Runtime.releaseObjectGroup', 'Runtime.discardConsoleEntries', 'Log.clear', 'Runtime.runIfWaitingForDebugger'
           send_response req
 
         ## control
         when 'Debugger.resume'
-          @q_msg << 'c'
-          @q_msg << req
           send_response req
           send_event 'Debugger.resumed'
+          @q_msg << 'c'
+          @q_msg << req
         when 'Debugger.stepOver'
           begin
             @session.check_postmortem
-            @q_msg << 'n'
             send_response req
             send_event 'Debugger.resumed'
+            @q_msg << 'n'
           rescue PostmortemError
             send_fail_response req,
                               code: INVALID_REQUEST,
@@ -332,9 +382,9 @@ module DEBUGGER__
         when 'Debugger.stepInto'
           begin
             @session.check_postmortem
-            @q_msg << 's'
             send_response req
             send_event 'Debugger.resumed'
+            @q_msg << 's'
           rescue PostmortemError
             send_fail_response req,
                               code: INVALID_REQUEST,
@@ -345,9 +395,9 @@ module DEBUGGER__
         when 'Debugger.stepOut'
           begin
             @session.check_postmortem
-            @q_msg << 'fin'
             send_response req
             send_event 'Debugger.resumed'
+            @q_msg << 'fin'
           rescue PostmortemError
             send_fail_response req,
                               code: INVALID_REQUEST,
@@ -366,41 +416,40 @@ module DEBUGGER__
 
         # breakpoint
         when 'Debugger.getPossibleBreakpoints'
-          s_id = req.dig('params', 'start', 'scriptId')
-          line = req.dig('params', 'start', 'lineNumber')
-          src = get_source_code s_id
-          end_line = src.count("\n")
-          line = end_line  if line > end_line
-          send_response req,
-                        locations: [
-                          { scriptId: s_id,
-                            lineNumber: line,
-                          }
-                        ]
+          @q_msg << req
         when 'Debugger.setBreakpointByUrl'
           line = req.dig('params', 'lineNumber')
-          url = req.dig('params', 'url')
-          locations = []
-          if url.match /http:\/\/debuggee(.*)/
-            path = $1
+          if regexp = req.dig('params', 'urlRegex')
+            path = regexp.match(/(.*)\|/)[1].gsub("\\", "")
             cond = req.dig('params', 'condition')
             src = get_source_code path
-            end_line = src.count("\n")
+            end_line = src.lines.count
             line = end_line  if line > end_line
-            b_id = "1:#{line}:#{path}"
+            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
-            locations << {scriptId: path, lineNumber: line}
+            # 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
+          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: []
           else
-            b_id = "1:#{line}:#{url}"
+            raise 'Unsupported'
           end
-          send_response req,
-                        breakpointId: b_id,
-                        locations: locations
         when 'Debugger.removeBreakpoint'
           b_id = req.dig('params', 'breakpointId')
           bps = del_bp bps, b_id
@@ -473,6 +522,7 @@ module DEBUGGER__
     end
 
     def cleanup_reader
+      super
       Process.kill :KILL, @chrome_pid if @chrome_pid
     end
 
@@ -512,21 +562,23 @@ module DEBUGGER__
 
   class Session
     def fail_response req, **result
-      @ui.respond_fail req, result
+      @ui.respond_fail req, **result
       return :retry
     end
 
     INVALID_PARAMS = -32602
+    INTERNAL_ERROR = -32603
 
     def process_protocol_request req
       case req['method']
-      when 'Debugger.stepOver', 'Debugger.stepInto', 'Debugger.stepOut', 'Debugger.resume', 'Debugger.getScriptSource'
+      when 'Debugger.stepOver', 'Debugger.stepInto', 'Debugger.stepOut', 'Debugger.resume', 'Debugger.enable'
         @tc << [:cdp, :backtrace, req]
       when 'Debugger.evaluateOnCallFrame'
         frame_id = req.dig('params', 'callFrameId')
+        group = req.dig('params', 'objectGroup')
         if fid = @frame_map[frame_id]
           expr = req.dig('params', 'expression')
-          @tc << [:cdp, :evaluate, req, fid, expr]
+          @tc << [:cdp, :evaluate, req, fid, expr, group]
         else
           fail_response req,
                         code: INVALID_PARAMS,
@@ -544,7 +596,7 @@ module DEBUGGER__
             @tc << [:cdp, :properties, req, oid]
           when 'script', 'global'
             # TODO: Support script and global types
-            @ui.respond req
+            @ui.respond req, result: []
             return :retry
           else
             raise "Unknown type: #{ref.inspect}"
@@ -554,6 +606,50 @@ module DEBUGGER__
                         code: INVALID_PARAMS,
                         message: "'objectId' is an invalid"
         end
+      when 'Debugger.getScriptSource'
+        s_id = req.dig('params', 'scriptId')
+        if src = @src_map[s_id]
+          @ui.respond req, scriptSource: src
+        else
+          fail_response req,
+                        code: INVALID_PARAMS,
+                        message: "'scriptId' is an invalid"
+        end
+        return :retry
+      when 'Debugger.getPossibleBreakpoints'
+        s_id = req.dig('params', 'start', 'scriptId')
+        if src = @src_map[s_id]
+          lineno = req.dig('params', 'start', 'lineNumber')
+          end_line = src.lines.count
+          lineno = end_line  if lineno > end_line
+          @ui.respond req,
+                      locations: [{
+                        scriptId: s_id,
+                        lineNumber: lineno
+                      }]
+        else
+          fail_response req,
+                        code: INVALID_PARAMS,
+                        message: "'scriptId' is an invalid"
+        end
+        return :retry
+      when 'Debugger.setBreakpointByUrl'
+        path = req.dig('params', 'scriptId')
+        if s_id = @scr_id_map[path]
+          lineno = req.dig('params', 'lineNumber')
+          b_id = req.dig('params', 'breakpointId')
+          @ui.respond req,
+                      breakpointId: b_id,
+                      locations: [{
+                          scriptId: s_id,
+                          lineNumber: lineno
+                      }]
+        else
+          fail_response req,
+                        code: INTERNAL_ERROR,
+                        message: 'The target script is not found...'
+        end
+        return :retry
       end
     end
 
@@ -565,20 +661,31 @@ module DEBUGGER__
         result[:callFrames].each.with_index do |frame, i|
           frame_id = frame[:callFrameId]
           @frame_map[frame_id] = i
-          s_id = frame.dig(:location, :scriptId)
-          if File.exist?(s_id) && !@script_paths.include?(s_id)
-            src = File.read(s_id)
-            @ui.fire_event 'Debugger.scriptParsed',
-                            scriptId: s_id,
-                            url: frame[:url],
-                            startLine: 0,
-                            startColumn: 0,
-                            endLine: src.count("\n"),
-                            endColumn: 0,
-                            executionContextId: @script_paths.size + 1,
-                            hash: src.hash
-            @script_paths << s_id
+          path = frame[:url]
+          unless s_id = @scr_id_map[path]
+            s_id = (@scr_id_map.size + 1).to_s
+            @scr_id_map[path] = s_id
+            if path && File.exist?(path)
+              src = File.read(path)
+            end
+            @src_map[s_id] = src
           end
+          if src = @src_map[s_id]
+            lineno = src.lines.count
+          else
+            lineno = 0
+          end
+          frame[:location][:scriptId] = s_id
+          frame[:functionLocation][:scriptId] = s_id
+          @ui.fire_event 'Debugger.scriptParsed',
+                          scriptId: s_id,
+                          url: frame[:url],
+                          startLine: 0,
+                          startColumn: 0,
+                          endLine: lineno,
+                          endColumn: 0,
+                          executionContextId: 1,
+                          hash: src.hash.inspect
 
           frame[:scopeChain].each {|s|
             oid = s.dig(:object, :objectId)
@@ -597,6 +704,33 @@ module DEBUGGER__
                         code: INVALID_PARAMS,
                         message: message
         else
+          src = req.dig('params', 'expression')
+          s_id = (@src_map.size + 1).to_s
+          @src_map[s_id] = src
+          lineno = src.lines.count
+          @ui.fire_event 'Debugger.scriptParsed',
+                            scriptId: s_id,
+                            url: '',
+                            startLine: 0,
+                            startColumn: 0,
+                            endLine: lineno,
+                            endColumn: 0,
+                            executionContextId: 1,
+                            hash: src.hash.inspect
+          if exc = result.dig(:response, :exceptionDetails)
+            exc[:stackTrace][:callFrames].each{|frame|
+              if frame[:url].empty?
+                frame[:scriptId] = s_id
+              else
+                path = frame[:url]
+                unless s_id = @scr_id_map[path]
+                  s_id = (@scr_id_map.size + 1).to_s
+                  @scr_id_map[path] = s_id
+                end
+                frame[:scriptId] = s_id
+              end
+            }
+          end
           rs = result.dig(:response, :result)
           [rs].each{|obj|
             if oid = obj[:objectId]
@@ -651,22 +785,25 @@ module DEBUGGER__
             exception = frame.raised_exception if frame == current_frame && frame.has_raised_exception
 
             path = frame.realpath || frame.path
-            if path.match /<internal:(.*)>/
-              path = $1
+
+            if frame.iseq.nil?
+              lineno = 0
+            else
+              lineno = frame.iseq.first_line - 1
             end
 
             {
               callFrameId: SecureRandom.hex(16),
               functionName: frame.name,
               functionLocation: {
-                scriptId: path,
-                lineNumber: 0
+                # scriptId: N, # filled by SESSION
+                lineNumber: lineno
               },
               location: {
-                scriptId: path,
+                # scriptId: N, # filled by SESSION
                 lineNumber: frame.location.lineno - 1 # The line number is 0-based.
               },
-              url: "http://debuggee#{path}",
+              url: path,
               scopeChain: [
                 {
                   type: 'local',
@@ -704,19 +841,18 @@ module DEBUGGER__
         event! :cdp_result, :backtrace, req, result
       when :evaluate
         res = {}
-        fid, expr = args
+        fid, expr, group = args
         frame = @target_frames[fid]
         message = nil
 
-        if frame && (b = frame.binding)
-          b = b.dup
-          special_local_variables current_frame do |name, var|
+        if frame && (b = frame.eval_binding)
+          special_local_variables frame do |name, var|
             b.local_variable_set(name, var) if /\%/ !~name
           end
 
           result = nil
 
-          case req.dig('params', 'objectGroup')
+          case group
           when 'popover'
             case expr
             # Chrome doesn't read instance variables
@@ -727,14 +863,12 @@ module DEBUGGER__
                   break false
                 end
               } and (message = "Error: Not defined global variable: #{expr.inspect}")
-            when /(\A[A-Z][a-zA-Z]*)/
+            when /(\A((::[A-Z]|[A-Z])\w*)+)/
               unless result = search_const(b, $1)
                 message = "Error: Not defined constant: #{expr.inspect}"
               end
             else
               begin
-                # try to check local variables
-                b.local_variable_defined?(expr) or raise NameError
                 result = b.local_variable_get(expr)
               rescue NameError
                 # try to check method
@@ -745,7 +879,7 @@ module DEBUGGER__
                 end
               end
             end
-          else
+          when 'console', 'watch-group'
             begin
               orig_stdout = $stdout
               $stdout = StringIO.new
@@ -753,18 +887,40 @@ module DEBUGGER__
             rescue Exception => e
               result = e
               b = result.backtrace.map{|e| "    #{e}\n"}
-              line = b.first.match('.*:(\d+):in .*')[1].to_i
+              frames = [
+                {
+                  columnNumber: 0,
+                  functionName: 'eval',
+                  lineNumber: 0,
+                  url: ''
+                }
+              ]
+              e.backtrace_locations&.each do |loc|
+                break if loc.path == __FILE__
+                path = loc.absolute_path || loc.path
+                frames << {
+                  columnNumber: 0,
+                  functionName: loc.base_label,
+                  lineNumber: loc.lineno - 1,
+                  url: path
+                }
+              end
               res[:exceptionDetails] = {
                 exceptionId: 1,
                 text: 'Uncaught',
-                lineNumber: line - 1,
+                lineNumber: 0,
                 columnNumber: 0,
                 exception: evaluate_result(result),
+                stackTrace: {
+                  callFrames: frames
+                }
               }
             ensure
               output = $stdout.string
               $stdout = orig_stdout
             end
+          else
+            message = "Error: unknown objectGroup: #{group}"
           end
         else
           result = Exception.new("Error: Can not evaluate on this frame")
@@ -816,32 +972,32 @@ module DEBUGGER__
             }
           when String
             prop = [
-              property('#length', obj.length),
-              property('#encoding', obj.encoding)
+              internalProperty('#length', obj.length),
+              internalProperty('#encoding', obj.encoding)
             ]
           when Class, Module
             result = obj.instance_variables.map{|iv|
               variable(iv, obj.instance_variable_get(iv))
             }
-            prop = [property('%ancestors', obj.ancestors[1..])]
+            prop = [internalProperty('%ancestors', obj.ancestors[1..])]
           when Range
             prop = [
-              property('#begin', obj.begin),
-              property('#end', obj.end),
+              internalProperty('#begin', obj.begin),
+              internalProperty('#end', obj.end),
             ]
           end
 
           result += obj.instance_variables.map{|iv|
             variable(iv, obj.instance_variable_get(iv))
           }
-          prop += [property('#class', obj.class)]
+          prop += [internalProperty('#class', obj.class)]
         end
         event! :cdp_result, :properties, req, result: result, internalProperties: prop
       end
     end
 
     def search_const b, expr
-      cs = expr.split('::')
+      cs = expr.delete_prefix('::').split('::')
       [Object, *b.eval('Module.nesting')].reverse_each{|mod|
         if cs.all?{|c|
              if mod.const_defined?(c)
@@ -862,14 +1018,15 @@ module DEBUGGER__
       v[:value]
     end
 
-    def property name, obj
+    def internalProperty name, obj
       v = variable name, obj
       v.delete :configurable
       v.delete :enumerable
       v
     end
 
-    def variable_ name, obj, type, description: obj.inspect, subtype: nil
+    def propertyDescriptor_ name, obj, type, description: nil, subtype: nil
+      description = DEBUGGER__.safe_inspect(obj, short: true) if description.nil?
       oid = rand.to_s
       @obj_map[oid] = obj
       prop = {
@@ -893,30 +1050,94 @@ module DEBUGGER__
       prop
     end
 
+    def preview_ value, hash, overflow
+      {
+        type: value[:type],
+        subtype: value[:subtype],
+        description: value[:description],
+        overflow: overflow,
+        properties: hash.map{|k, v|
+          pd = propertyDescriptor k, v
+          {
+            name: pd[:name],
+            type: pd[:value][:type],
+            value: pd[:value][:description]
+          }
+        }
+      }
+    end
+
     def variable name, obj
+      pd = propertyDescriptor name, obj
+      case obj
+      when Array
+        pd[:value][:preview] = preview name, obj
+        obj.each_with_index{|item, idx|
+          if valuePreview = preview(idx.to_s, item)
+            pd[:value][:preview][:properties][idx][:valuePreview] = valuePreview
+          end
+        }
+      when Hash
+        pd[:value][:preview] = preview name, obj
+        obj.each_with_index{|item, idx|
+          key, val = item
+          if valuePreview = preview(key, val)
+            pd[:value][:preview][:properties][idx][:valuePreview] = valuePreview
+          end
+        }
+      end
+      pd
+    end
+
+    def preview name, obj
+      case obj
+      when Array
+        pd = propertyDescriptor name, obj
+        overflow = false
+        if obj.size > 100
+          obj = obj[0..99]
+          overflow = true
+        end
+        hash = obj.each_with_index.to_h{|o, i| [i.to_s, o]}
+        preview_ pd[:value], hash, overflow
+      when Hash
+        pd = propertyDescriptor name, obj
+        overflow = false
+        if obj.size > 100
+          obj = obj.to_a[0..99].to_h
+          overflow = true
+        end
+        preview_ pd[:value], obj, overflow
+      else
+        nil
+      end
+    end
+
+    def propertyDescriptor name, obj
       case obj
       when Array
-        variable_ name, obj, 'object', description: "Array(#{obj.size})", subtype: 'array'
+        propertyDescriptor_ name, obj, 'object', subtype: 'array'
       when Hash
-        variable_ name, obj, 'object', description: "Hash(#{obj.size})", subtype: 'map'
+        propertyDescriptor_ name, obj, 'object', subtype: 'map'
       when String
-        variable_ name, obj, 'string', description: obj
-      when Class, Module, Struct, Range, Time, Method
-        variable_ name, obj, 'object'
+        propertyDescriptor_ name, obj, 'string', description: obj
       when TrueClass, FalseClass
-        variable_ name, obj, 'boolean'
+        propertyDescriptor_ name, obj, 'boolean'
       when Symbol
-        variable_ name, obj, 'symbol'
+        propertyDescriptor_ name, obj, 'symbol'
       when Integer, Float
-        variable_ name, obj, 'number'
+        propertyDescriptor_ name, obj, 'number'
       when Exception
-        bt = nil
-        if log = obj.backtrace
-          bt = log.map{|e| "    #{e}\n"}.join
+        bt = ''
+        if log = obj.backtrace_locations
+          log.each do |loc|
+            break if loc.path == __FILE__
+            bt += "    #{loc}\n"
+          end
         end
-        variable_ name, obj, 'object', description: "#{obj.inspect}\n#{bt}", subtype: 'error'
+        propertyDescriptor_ name, obj, 'object', description: "#{obj.inspect}\n#{bt}", subtype: 'error'
       else
-        variable_ name, obj, 'undefined'
+        propertyDescriptor_ name, obj, 'object'
       end
     end
   end