nrepl-lazuli 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e198f7aeaa4e73c02bb95aab3cc78233e64730eb9da1c7a7a3b81100dc2063b1
-  data.tar.gz: f5bb2f932d3520450821ec746527c52c9a2aeb7bf2946cf37f7aa98d1b92f10e
+  metadata.gz: 35d0ce415821f889b64d53b1ea8f88b11a96d43a8932e00108d991b3bfc7a7fb
+  data.tar.gz: 6b72192793c3bc68883c1396c4c86d1a1dbed7976692f75e1dfc1f3a0fecf938
 SHA512:
-  metadata.gz: 8b4b0f03d9673e708b6aabad549544d812bd3d06e63748507e39595e748a02c5a2344ac5f1d6819cb501b462b667756c3225da6a6a1254b72488f0e1115f20ea
-  data.tar.gz: 074bfe1128eac938c707fc33f2add4e388ab762ab0ecbd3113300829ffee2f67fe60f2246bf590953734065c68a40e8e398bd3a77b8104f7a81ce64a3f8bdf0a
+  metadata.gz: 5e6639603de1e57633eb29742732ffedb483d6c101cc96c2cb9c1d3a2940e2d2aa0a49c5510d8ac3eaceccc1ed69bea56dd0e20693813ef0714e9d5ecc3f1cad
+  data.tar.gz: bc667ae67a50840cab449027e7b6d1e990303e2986809823effec71d278811399ddc53aee3a561c3fc4dd3c0fa75ca81bcc40401b0301b0ce49f1a97f9de9f4d

data/lib/nrepl-lazuli/connection.rb

@@ -4,17 +4,18 @@ module NREPL
 
     def initialize(
       input, debug: false, out: input,
-      watches: NREPL.class_variable_get(:@@watches), binding: nil,
-      auto_bindings: {}
+      binding: nil,
+      bindings: {},
+      bindings_by_id: {}
     )
       @debug = debug
       @in = input
       @out = out
       @pending_evals = {}
-      @watches = watches
       @counter = 0
       @binding = binding
-      @auto_bindings = auto_bindings
+      @bindings = bindings
+      @bindings_by_id = bindings_by_id
     end
 
     def treat_messages!
@@ -27,6 +28,8 @@ module NREPL
         treat_msg(msg)
       end
       @pending_evals.each { |(i, _)| clear_eval!(i) }
+    rescue Errno::ECONNRESET
+      @pending_evals.each { |(i, _)| clear_eval!(i) }
     end
 
     def treat_msg(msg)
@@ -39,6 +42,9 @@ module NREPL
         eval_op(msg, false)
       when 'eval_pause'
         eval_op(msg, true)
+      when 'last_exception'
+        ex = Server.class_variable_get(:@@last_exception)
+        send_msg(response_for(msg, { 'result' => ex.inspect, 'status' => ['done'] }))
       when 'eval_resume'
         msg['id'] ||= "eval_#{@counter += 1}"
         stop_id = msg['stop_id']
@@ -51,7 +57,14 @@ module NREPL
       when 'unwatch'
         msg['id'] ||= "eval_#{@counter += 1}"
         watch_id = msg['watch_id']
-        @watches.delete(watch_id)
+        info = @bindings_by_id.delete(watch_id)
+        if(info)
+          file_info = @bindings.fetch(info[:file], {})
+          content = file_info.fetch(info[:row], {})
+          content.delete(watch_id)
+          file_info.delete(info[:row]) if(content.empty?)
+          @bindings.delete(info[:file]) if(file_info.empty?)
+        end
 
         send_msg(response_for(msg, {
           'status' => ['done'],
@@ -84,7 +97,7 @@ module NREPL
       when 'watches_for_file'
         msg['id'] ||= "eval_#{@counter += 1}"
         file = msg['file']
-        rows_bindings = @auto_bindings[file] || {}
+        rows_bindings = @bindings[file] || {}
         send_msg(response_for(msg, {
           'status' => ['done'],
           'rows' => rows_bindings.keys.sort,
@@ -148,7 +161,7 @@ module NREPL
         original_bind = if msg['stop_id']
           @pending_evals.fetch(msg['stop_id'], {})[:binding]
         elsif msg['watch_id']
-          @watches.fetch(msg['watch_id'], {})[:binding]
+          @bindings_by_id.fetch(msg['watch_id'], {})[:binding]
         else
           find_row_based_binding(msg) || @binding
         end
@@ -165,10 +178,10 @@ module NREPL
       row = msg['line']
       return if !file || !row
 
-      rows_bindings = @auto_bindings[file]
+      rows_bindings = @bindings[file]
       return unless rows_bindings
       found_row = row.downto(-1).find { |k| rows_bindings[k] }
-      rows_bindings[found_row]
+      rows_bindings[found_row].values[-1] if found_row
     end
 
     private def define_stop_function!(msg, method_name)
@@ -226,9 +239,6 @@ module NREPL
       send_msg(response_for(msg, { 'versions' => versions }))
     end
 
-    # @param [TCPSocket] client
-    # @param [Hash] msg
-    # @param [Exception] e
     def send_exception(msg, e)
       send_msg(response_for(msg, { 'ex' => e.message, 'status' => ['done', 'error'] }))
     end
@@ -245,5 +255,6 @@ end
 b = binding
 define_method(:evaluate_code) do |code, file, line, bind|
   bind ||= b
-  eval(code, bind, file || "EVAL", line || 0).inspect
+  line = line ? line + 1 : 1
+  eval(code, bind, file || "EVAL", line).inspect
 end

data/lib/nrepl-lazuli/fake_stdout.rb

@@ -24,7 +24,8 @@ module NREPL
       nil
     end
 
-    def write(text='')
+    def write(*texts)
+      text = texts.join('')
       @connections.each do |conn|
         conn.send_msg(
           @kind => text

data/lib/nrepl-lazuli/server.rb

@@ -13,6 +13,14 @@ module NREPL
     attr_reader :debug, :port, :host
     alias debug? debug
 
+    def self.spawn(args)
+      t = Thread.new {
+        new(**args).start
+      }
+      sleep 0.1
+      t[:nrepl_server]
+    end
+
     def self.start(**kwargs)
       new(**kwargs).start
     end
@@ -21,15 +29,27 @@ module NREPL
       new(**kwargs.merge(binding: binding)).start
     end
 
-    def initialize(port: DEFAULT_PORT, host: DEFAULT_HOST, debug: false, binding: nil, pwd: Dir.pwd)
+    def initialize(
+      port: DEFAULT_PORT,
+      host: DEFAULT_HOST,
+      debug: false,
+      binding: nil,
+      pwd: Dir.pwd,
+      tracing: true
+    )
       @port  = port
       @pwd = pwd
       @host  = host
       @debug = debug
       @connections = Set.new
       @binding = binding
-      @auto_bindings = {}
+      @bindings = {}
+      @bindings_by_id = {}
+      @tracing = tracing
+      Thread.current[:nrepl_server] = self
       NREPL.class_variable_set(:@@connections, @connections)
+      NREPL.class_variable_set(:@@bindings, @bindings)
+      NREPL.class_variable_set(:@@bindings_by_id, @bindings_by_id)
     end
 
     private def record_port
@@ -43,33 +63,46 @@ module NREPL
       puts "Running in debug mode" if debug?
       record_port
 
+      @old_out, @old_err = $stdout, $stderr
       $stdout = FakeStdout.new(@connections, STDOUT, "out")
       $stderr = FakeStdout.new(@connections, STDERR, "err")
-      auto_create_bindings!
+      auto_create_bindings! if @tracing
 
       Signal.trap("INT") { stop }
       Signal.trap("TERM") { stop }
 
-      s = TCPServer.new(host, port)
+      @socket = TCPServer.new(host, port)
       loop do
-        Thread.start(s.accept) do |client|
-          connection = Connection.new(client, debug: debug?, binding: @binding, auto_bindings: @auto_bindings)
+        break if @socket.closed?
+        Thread.start(@socket.accept) do |client|
+          connection = Connection.new(
+            client,
+            debug: debug?,
+            binding: @binding,
+            bindings_by_id: @bindings_by_id,
+            bindings: @bindings
+          )
           @connections << connection
           connection.treat_messages!
           @connections.delete(connection)
         end
       end
+    rescue IOError
+      puts "Server closed" if debug?
     ensure
       File.unlink(PORT_FILENAME)
     end
 
     def auto_create_bindings!
       dir_regex = Regexp.new("^#{Regexp.escape(@pwd)}")
-      @call_trace = TracePoint.new(:call) do |tp|
-        @auto_bindings[tp.path] ||= {}
-        @auto_bindings[tp.path][tp.lineno-1] = tp.binding
+      @call_trace = TracePoint.new(:class, :call) do |tp|
+        id = "#{tp.path}:#{tp.lineno}"
+        b = tp.binding
+        @bindings_by_id[id] = {binding: b, file: tp.path, row: tp.lineno-1}
+        @bindings[tp.path] ||= {}
+        @bindings[tp.path][tp.lineno-1] ||= {}
+        @bindings[tp.path][tp.lineno-1][id] = b
         if tp.path =~ dir_regex
-          # puts "Tracing #{tp.path}:#{tp.lineno}"
           @connections.each do |connection|
             connection.send_msg(
               'op' => 'hit_auto_watch',
@@ -81,11 +114,18 @@ module NREPL
         end
       end
       @call_trace.enable
+
+      @ex_trace = TracePoint.new(:raise) do |tp|
+        e = tp.raised_exception
+        @@last_exception = [:error, e.inspect.sub(/\>$/, ' stack=' + e.backtrace.inspect+'>')]
+      end
+      @ex_trace.enable
     end
 
     def stop
-      Thread.exit
-      exit(0)
+      @connections = []
+      $stdout, $stderr = @old_out, @old_err
+      @socket.close
     end
   end
 

data/lib/nrepl-lazuli.rb

@@ -7,15 +7,21 @@ module NREPL
   PORT_FILENAME = '.nrepl-port'
 
   require_relative 'nrepl-lazuli/server'
-  @@watches = {}
+  @@bindings = {}
+  @@bindings_by_id = {}
   @@connections = Set.new
 
   def self.watch!(binding, id=nil)
-    (file, row) = caller[0].split(/:/)
+    loc = caller_locations[0]
+    file = loc.path
+    row = loc.lineno
     id ||= "#{file}:#{row}"
-    row = row.to_i
 
-    @@watches[id] = {binding: binding}
+    @@bindings_by_id[id] = {binding: binding, file: file, row: loc.lineno-1}
+    @@bindings[file] ||= {}
+    @@bindings[file][loc.lineno-1] ||= {}
+    @@bindings[file][loc.lineno-1][id] = binding
+
     @@connections.each do |connection|
       connection.send_msg(
         'op' => 'hit_watch',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Maurício Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bencode
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key: 
 specification_version: 4
 summary: A Ruby nREPL server