nrepl-lazuli 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eabdc5490b15f4402769dbdf5a21d3eb27e206df7a5e1effcbcd8d3d919ea9fa
-  data.tar.gz: f3d43cf6d6d1065f676147e87a03280d08fbe29bf28f9deeede58a8cfff126fd
+  metadata.gz: 7e7940230b6c771925c5ee557cecd7a98e043cbe94fed89efe8dee2ce77611c5
+  data.tar.gz: e36fda8c9c90cdb098e8e5e8307ce487cb28776d3c0de28e075964fea7acb4ed
 SHA512:
-  metadata.gz: 49da53ef4958b719b6c46835431bdc8cbc78a5d0624d28b88994b8589ffcfd06c71fb5d44056ee1af4ec73a49a8dcadab3d03c0d3b88d6882f6df5f5a1a8386f
-  data.tar.gz: fb81f3e46cd3e4ec8a5b2da284b5310d3da694ec552cd3246722b19f9a57fa4404e0998faee52c63db760d9cf009fbbb0b788a0ee30c944eb8d236a322fa9dec
+  metadata.gz: e7a121b406ed724c1c433cd9a854f6082d1628b0557ebc9fb9bbd6f9e6c8a26c2f9c0390708f954ef3154b107d5234d7a332e343911426585c7fb9ec82b35247
+  data.tar.gz: e183f6dc2766a16297f27fbf08b7c164b9b43e8c88b753fff43bedb96b1a3ef2b7649187a53703a6d591e18c6c1d3fc7d578f7af9ac4b5b39b87c861b392f490

data/lib/nrepl-lazuli/connection.rb

@@ -3,12 +3,16 @@ module NREPL
     @@debug_counter = 0
 
     def initialize(
-      input, debug: false, out: input,
+      input,
+      server:,
+      debug: false,
+      out: input,
       binding: nil,
       bindings: {},
       bindings_by_id: {}
     )
       @debug = debug
+      @server = server
       @in = input
       @out = out
       @pending_evals = {}
@@ -16,10 +20,11 @@ module NREPL
       @binding = binding
       @bindings = bindings
       @bindings_by_id = bindings_by_id
+      @retries = 0
     end
 
     def treat_messages!
-      bencode = BEncode::Parser.new(@in)
+      bencode = BEncode.new(@in)
       loop do
         break if @in.eof?
         msg = bencode.parse!
@@ -30,6 +35,8 @@ module NREPL
       @pending_evals.each { |(i, _)| clear_eval!(i) }
     rescue Errno::ECONNRESET
       @pending_evals.each { |(i, _)| clear_eval!(i) }
+    rescue => e
+      STDOUT.puts "CRASH! #{e}"
     end
 
     def treat_msg(msg)
@@ -132,6 +139,10 @@ module NREPL
           'rows' => rows_bindings.keys.sort,
           'op' => msg['op']
         }))
+      when 'set_trace'
+        disable = msg['trace'] == 0
+        disable ? @server.call_trace.disable : @server.call_trace.enable
+        send_msg(response_for(msg, { 'op' => msg['op'], 'status' => ['done'] }))
       else
         send_msg(response_for(msg, {
           'op' => msg['op'],
@@ -296,8 +307,11 @@ module NREPL
 
     def send_msg(msg)
       debug "Sending", msg
-      @out.write(msg.bencode)
+      @out.write_nonblock(BEncode.encode(msg))
       @out.flush
+    rescue IO::EAGAINWaitWritable
+      @retries += 1
+      @out.close if @retries > 50
     end
   end
 end

data/lib/nrepl-lazuli/server.rb

@@ -3,14 +3,14 @@
 # A Ruby port of ogion https://gitlab.com/technomancy/ogion &
 # https://github.com/borkdude/nrepl-server/blob/master/src/borkdude/nrepl_server.clj
 
-require 'bencode'
 require 'socket'
+require_relative 'bencode'
 require_relative 'connection'
 require_relative 'fake_stdout'
 
 module NREPL
   class Server
-    attr_reader :debug, :port, :host
+    attr_reader :debug, :port, :host, :call_trace
     alias debug? debug
 
     def self.spawn(args = {})
@@ -35,7 +35,8 @@ module NREPL
       debug: false,
       binding: nil,
       pwd: Dir.pwd,
-      tracing: true
+      tracing: true,
+      loader: nil
     )
       @port  = port
       @pwd = pwd
@@ -43,9 +44,20 @@ module NREPL
       @debug = debug
       @connections = Set.new
       @binding = binding
-      @bindings = {}
-      @bindings_by_id = {}
+      loc = caller_locations.reject { |x| x.absolute_path =~ /nrepl\-lazuli/ }[0]
+      loc = caller_locations[0] if(!loc)
+      path = loc.absolute_path
+      line = loc.lineno - 1
+      @bindings = {path => {line => {"NREPL::Server.start" => binding}}}
+      @bindings_by_id = {
+        "NREPL::Server.start" => {
+          binding: binding,
+          file: path,
+          row: line
+        }
+      }
       @tracing = tracing
+      @loader = loader
       Thread.current[:nrepl_server] = self
       NREPL.class_variable_set(:@@connections, @connections)
       NREPL.class_variable_set(:@@bindings, @bindings)
@@ -66,7 +78,7 @@ module NREPL
       @old_out, @old_err = $stdout, $stderr
       $stdout = FakeStdout.new(@connections, STDOUT, "out")
       $stderr = FakeStdout.new(@connections, STDERR, "err")
-      auto_create_bindings! if @tracing
+      auto_create_bindings!
 
       Signal.trap("INT") { stop }
       Signal.trap("TERM") { stop }
@@ -77,7 +89,8 @@ module NREPL
         Thread.start(@socket.accept) do |client|
           connection = Connection.new(
             client,
-            debug: debug?,
+            server: self,
+            debug: @debug,
             binding: @binding,
             bindings_by_id: @bindings_by_id,
             bindings: @bindings
@@ -95,7 +108,7 @@ module NREPL
 
     def auto_create_bindings!
       dir_regex = Regexp.new("^#{Regexp.escape(@pwd)}")
-      @call_trace = TracePoint.new(:class, :call) do |tp|
+      trace_proc = proc do |tp|
         path = tp.path
         next if tp.path =~ /^(\<|.eval)/
         path = File.join(@pwd, path) if File.dirname(path) == '.'
@@ -105,6 +118,13 @@ module NREPL
         @bindings[path] ||= {}
         @bindings[path][tp.lineno-1] ||= {}
         @bindings[path][tp.lineno-1][id] = b
+        path
+      end
+      @class_trace = TracePoint.new(:class, &trace_proc)
+      @class_trace.enable
+
+      @call_trace = TracePoint.new(:call) do |tp|
+        path = trace_proc.call(tp)
         if path =~ dir_regex
           @connections.each do |connection|
             connection.send_msg(
@@ -116,7 +136,23 @@ module NREPL
           end
         end
       end
-      @call_trace.enable
+      @call_trace.enable if @tracing
+
+      if @loader
+        need_to_pause = true
+        original_trace = nil
+        @loader.on_load do
+          next unless need_to_pause
+          need_to_pause = false
+          original_trace = call_trace.enabled?
+          @call_trace.disable
+          Thread.new do
+            sleep 5
+            @call_trace.enable if original_trace
+            need_to_pause = true
+          end
+        end
+      end
 
       @ex_trace = TracePoint.new(:raise) do |tp|
         e = tp.raised_exception

data/lib/nrepl-lazuli.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'set'
 
 module NREPL
   VERSION = '0.1.0'

metadata

@@ -1,29 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nrepl-lazuli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Maurício Szabo
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bencode
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+date: 2025-04-04 00:00:00.000000000 Z
+dependencies: []
 description: A Ruby nREPL server, made to be used with Lazuli plug-in (but can be
   used with any nREPL client too)
 email: mauricio@szabo.link
@@ -40,7 +25,6 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://gitlab.com/clj-editors/nrepl-lazuli
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -55,8 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Ruby nREPL server
 test_files: []