nwc-ruby 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d73701179764ad26d1ad95d212e1abd5856788a951591e3f8489b16e66d0f0
-  data.tar.gz: 97047cb484ab707715cd0ce4590d356a9b0e23a307729c808f0098f043c94dba
+  metadata.gz: b847b05f148d03753548528e0f4483129cf59887e40329f28e7bbe31f0eda1cd
+  data.tar.gz: 9c99704df81a6e7cfa9c1bfede014b49270b15bf11a3bba8663b5d6f1f3500fa
 SHA512:
-  metadata.gz: f7bfd6655a81a49a9c04e534a872be4be1438af498b77f452a14706feb8535b9421745cc4f15c488339532019e1f94fb0b56d14c55a565b440f6232fea067b74
-  data.tar.gz: 8af52b0b23683c1c62e0d64f4c02597c82c9aa64ae277da7d7099208453ba596db58b3762abdb728a08c2d063013befc39f8c699c39ce4e66aa921c77e90a839
+  metadata.gz: 11e62747c2dfa88459d900a2e1f89e7a42df5420b88221508bf62df39b65ebe7f9937db357557b2ab3ee8b95be0b50b5062fa3667cf21002dbf607366f49675d
+  data.tar.gz: c0ff4c40f5d8fa68d3b12e6b7c745ff1ff5b19da5719c0998c8cc5db6098ee77917c2c914b0ca96dc9e9301ac4240595f7e472019e6001394c996e75ffdcff6a

data/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.2] — 2026-04-21
+
+### Fixed
+
+- Ctrl+C / SIGINT / SIGTERM now reliably exits the notification listener. The
+  previous trap handler called `@conn.close` directly, which deadlocks because
+  closing an SSL socket from inside a Ruby signal handler is unsafe
+  (`docker stop` was the only way out).
+- Replaced the trap-based close with a self-pipe: the trap only flips `@stop`
+  and writes one byte to a pipe; an `Async` task reads from the pipe inside the
+  reactor and calls `top.stop` from the correct fiber context. This avoids two
+  further async-specific pitfalls discovered along the way — `Async::Task#stop`
+  raises `ThreadError: can't be called from trap context` (uses a Mutex), and
+  offloading to `Thread.new { task.stop }` fails with `NoMethodError` on
+  `Fiber.scheduler` because the reactor lives on a different thread.
+- Added `rescue Interrupt, Async::Stop` at the top of the reconnect-loop rescue
+  chain in `RelayConnection#run!` so the stop signal is not swallowed by the
+  generic reconnect-on-error path.
+
 ## [0.2.1] — 2026-04-20
 
 ### Fixed

data/lib/nwc_ruby/transport/relay_connection.rb

@@ -63,14 +63,19 @@ module NwcRuby
 
       def stop!
         @stop = true
-        # Close the websocket to unblock the read loop. The @stop flag
-        # will cause the run loop to exit on its own. We avoid calling
-        # @top_task.stop here because stop! may be called from a
-        # different thread than the Async reactor.
-        begin
-          @conn&.close
-        rescue StandardError
-          nil
+        # Poke the signal pipe if available (works from any thread); the
+        # watcher task will call @top_task.stop from inside the reactor.
+        # If we're already inside the reactor thread/fiber, we can stop
+        # the top task directly.
+        if @signal_pipe_w
+          begin
+            @signal_pipe_w.write_nonblock('.')
+          rescue IO::WaitWritable, Errno::EPIPE, IOError
+            nil
+          end
+        else
+          task = @top_task
+          task&.stop
         end
       end
 
@@ -82,10 +87,15 @@ module NwcRuby
 
         Async do |top|
           @top_task = top
+          signal_watcher = start_signal_watcher(top)
           until @stop
             begin
               run_one_connection(top)
               backoff = 1
+            rescue Interrupt, Async::Stop
+              # Ctrl-C / SIGTERM / task.stop: exit cleanly.
+              @stop = true
+              break
             rescue StandardError => e
               break if @stop
 
@@ -97,7 +107,12 @@ module NwcRuby
               backoff *= 2
             end
           end
+        rescue Interrupt
+          # Signal arrived while not inside a connection; just exit.
+          @stop = true
         ensure
+          signal_watcher&.stop
+          close_signal_pipe
           @top_task = nil
         end
       end
@@ -219,19 +234,51 @@ module NwcRuby
       end
 
       def install_traps
+        # Keep signal handlers tiny. We can't do much from inside a Ruby
+        # signal handler:
+        #   - SSL I/O / socket close can deadlock.
+        #   - Async::Task#stop takes a Mutex, which raises
+        #     "can't be called from trap context (ThreadError)".
+        #   - Thread.new { task.stop } runs outside the reactor and
+        #     Fiber.scheduler is nil there.
+        # So: flip a flag and poke a self-pipe. An Async task watches the
+        # read end of the pipe and calls @top_task.stop from inside the
+        # reactor, which is the only safe place to do it.
+        @signal_pipe_r, @signal_pipe_w = IO.pipe
         %w[TERM INT].each do |sig|
           trap(sig) do
             @stop = true
-            # Close the socket to unblock the read loop.
             begin
-              @conn&.close
-            rescue StandardError
+              @signal_pipe_w.write_nonblock('.')
+            rescue IO::WaitWritable, Errno::EPIPE, IOError
               nil
             end
           end
         end
       end
 
+      def start_signal_watcher(top)
+        return unless @signal_pipe_r
+
+        top.async do
+          @signal_pipe_r.read(1)
+          @logger.debug('[nwc] signal received, stopping')
+          top.stop
+        rescue IOError, Errno::EBADF
+          nil
+        end
+      end
+
+      def close_signal_pipe
+        [@signal_pipe_r, @signal_pipe_w].each do |io|
+          io&.close
+        rescue IOError
+          nil
+        end
+        @signal_pipe_r = nil
+        @signal_pipe_w = nil
+      end
+
       def default_logger
         logger = Logger.new($stdout)
         logger.level = ENV['NWC_LOG_LEVEL'] ? Logger.const_get(ENV['NWC_LOG_LEVEL'].upcase) : Logger::INFO

data/lib/nwc_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NwcRuby
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nwc-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - MegalithicBTC