nrepl-lazuli 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb08e5429998d1320a2f3b4db07b336c389af0e3a1f008c67dbb4236af27af4a
-  data.tar.gz: 9eb7a44c8d716860eeb09f18025dd5dd47713554384e9be249683b1ec7b11bf9
+  metadata.gz: 35d0ce415821f889b64d53b1ea8f88b11a96d43a8932e00108d991b3bfc7a7fb
+  data.tar.gz: 6b72192793c3bc68883c1396c4c86d1a1dbed7976692f75e1dfc1f3a0fecf938
 SHA512:
-  metadata.gz: f3aec4c5b770994bb11be7f6fdfcbbaa4c0a1050e4964c0a10cd0cf4b95c6014ce0dd40cc765cad1815b93f429bb0c2a3a66a70aa03f730392d03bad0c71e29c
-  data.tar.gz: 33d341eddae865f76f8463353b2232aaec4edd480f12301856bf618223f8f23fe7b237397e5d39135e3d745e9c57cbf22c6e658b61f9fa68c9756ccc81c65c35
+  metadata.gz: 5e6639603de1e57633eb29742732ffedb483d6c101cc96c2cb9c1d3a2940e2d2aa0a49c5510d8ac3eaceccc1ed69bea56dd0e20693813ef0714e9d5ecc3f1cad
+  data.tar.gz: bc667ae67a50840cab449027e7b6d1e990303e2986809823effec71d278811399ddc53aee3a561c3fc4dd3c0fa75ca81bcc40401b0301b0ce49f1a97f9de9f4d

data/lib/nrepl-lazuli/connection.rb

@@ -4,18 +4,18 @@ module NREPL
 
     def initialize(
       input, debug: false, out: input,
-      watches: NREPL.class_variable_get(:@@bindings),
       binding: nil,
-      bindings: {}
+      bindings: {},
+      bindings_by_id: {}
     )
       @debug = debug
       @in = input
       @out = out
       @pending_evals = {}
-      @watches = watches
       @counter = 0
       @binding = binding
       @bindings = bindings
+      @bindings_by_id = bindings_by_id
     end
 
     def treat_messages!
@@ -28,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)
@@ -40,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']
@@ -52,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'],
@@ -110,7 +122,6 @@ module NREPL
         begin
           eval_msg(msg, stop)
         rescue Exception => e
-          puts e.backtrace
           send_exception(msg, e)
         ensure
           @pending_evals.delete(id) unless stop
@@ -150,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
@@ -170,7 +181,7 @@ module NREPL
       rows_bindings = @bindings[file]
       return unless rows_bindings
       found_row = row.downto(-1).find { |k| rows_bindings[k] }
-      rows_bindings[found_row][:binding] if found_row
+      rows_bindings[found_row].values[-1] if found_row
     end
 
     private def define_stop_function!(msg, method_name)
@@ -228,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
@@ -247,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/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,7 +29,14 @@ 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
@@ -29,8 +44,12 @@ module NREPL
       @connections = Set.new
       @binding = binding
       @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
@@ -44,31 +63,45 @@ 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, bindings: @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|
+      @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] = {binding: tp.binding, id: "#{tp.path}:#{tp.lineno}"}
+        @bindings[tp.path][tp.lineno-1] ||= {}
+        @bindings[tp.path][tp.lineno-1][id] = b
         if tp.path =~ dir_regex
           @connections.each do |connection|
             connection.send_msg(
@@ -82,16 +115,17 @@ module NREPL
       end
       @call_trace.enable
 
-      # @ex_trace = TracePoint.new(:raise) do |tp|
-      #   $foo = [tp.lineno, tp.event, tp.raised_exception, tp.binding, caller_locations]
-      #   # p $foo
-      # end
-      # @ex_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

@@ -8,16 +8,19 @@ module NREPL
 
   require_relative 'nrepl-lazuli/server'
   @@bindings = {}
+  @@bindings_by_id = {}
   @@connections = Set.new
 
   def self.watch!(binding, id=nil)
     loc = caller_locations[0]
-    file = loc.absolute_path
+    file = loc.path
     row = loc.lineno
     id ||= "#{file}:#{row}"
 
+    @@bindings_by_id[id] = {binding: binding, file: file, row: loc.lineno-1}
     @@bindings[file] ||= {}
-    @@bindings[file][loc.lineno-1] = {id: id, binding: binding}
+    @@bindings[file][loc.lineno-1] ||= {}
+    @@bindings[file][loc.lineno-1][id] = binding
 
     @@connections.each do |connection|
       connection.send_msg(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Maurício Szabo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-05 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