omq 0.17.2 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8a35ab8a212a111e78889494ac1eb18f780b6315eb3993eb83d04ae7ebdb222
-  data.tar.gz: 32727fe82814e3d36843dcbd82d66ecfbd9c26e5c36e7a173bdcf164dd649f75
+  metadata.gz: 6c00d04d926fae9c6feb6526a611ff3f2ebc05812c7387ac0f97206c7a0b15bb
+  data.tar.gz: 6af6b6ce8996c5f5082aac1f3b44339de359876aa17e01cfe2255b4681a053c6
 SHA512:
-  metadata.gz: 1f78b8ff8a907b606ec376a7186a09b77b91317c91f3bdb1ff7ebd600d36d6e6fea4738b72dc4ddd3c611225df4a9c27fbd8418fe73dfcdf7a20985fdee5516b
-  data.tar.gz: 3811837748c18669dd6dc604c8253cfdb7b0e26a6c9eda3b61a4c711ac441f88b58c283701e6985880aa03d963338b53cc4271c3e456e6499498f9ce21037d85
+  metadata.gz: 0db98892b62b35fc06e7a9fca89868ff1dec3bddc5ab4b5d4039bf29290702ed6db122c609c2311789159520638f9339744fdf20df39086b350f183c502075a9
+  data.tar.gz: 85eae7b6058ead5d02cdddd41bec7dced3882b44267f1a566bc5964eab11eca6d56de23898f9912f985f86685f32690b2edfc555eee0784ac8f74da470c2cd71

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 0.17.4 — 2026-04-10
+
+### Fixed
+
+- **Connect timeout at the transport level.** `TCP.connect` now uses
+  `::Socket.tcp(host, port, connect_timeout:)` instead of
+  `TCPSocket.new`. The timeout is derived from the reconnect interval
+  (floor 0.5s). Fixes a hang on macOS where a non-blocking IPv6
+  `connect(2)` to `::1` via kqueue never delivers `ECONNREFUSED` when
+  nothing is listening — `TCPSocket.new` blocked the fiber indefinitely
+  because `Async::Task#with_timeout` cannot interrupt C-level blocking
+  calls. `::Socket.tcp` uses kernel-level `connect_timeout:` which works
+  regardless of the scheduler.
+
+## 0.17.3 — 2026-04-10
+
+### Fixed
+
+- **Connect timeout in reconnect loop.** Each connect attempt is now
+  capped at the reconnect interval (floor 0.5s) via
+  `Async::Task#with_timeout`. Fixes a hang on macOS where a non-blocking
+  IPv6 `connect(2)` to `::1` via kqueue never delivers `ECONNREFUSED`
+  when nothing is listening — the fiber would block indefinitely,
+  stalling the entire reconnect loop.
+
+### Changed
+
+- **Extracted `Reconnect#retry_loop`.** The reconnect retry loop is now
+  a separate private method, keeping `#run` focused on task spawning and
+  error handling.
+
 ## 0.17.2 — 2026-04-10
 
 ### Fixed

data/lib/omq/engine/reconnect.rb

@@ -37,21 +37,8 @@ module OMQ
       # @return [void]
       #
       def run(parent_task, delay: nil)
-        delay, max_delay = init_delay(delay)
-
         @engine.tasks << parent_task.async(transient: true, annotation: "reconnect #{@endpoint}") do
-          loop do
-            break if @engine.closed?
-            sleep quantized_wait(delay) if delay > 0
-            break if @engine.closed?
-            begin
-              @engine.transport_for(@endpoint).connect(@endpoint, @engine)
-              break
-            rescue *CONNECTION_LOST, *CONNECTION_FAILED, Protocol::ZMTP::Error
-              delay = next_delay(delay, max_delay)
-              @engine.emit_monitor_event(:connect_retried, endpoint: @endpoint, detail: { interval: delay })
-            end
-          end
+          retry_loop(delay: delay)
         rescue Async::Stop
         rescue => error
           @engine.signal_fatal_error(error)
@@ -60,6 +47,25 @@ module OMQ
 
       private
 
+
+      def retry_loop(delay: nil)
+        delay, max_delay = init_delay(delay)
+
+        loop do
+          break if @engine.closed?
+          sleep quantized_wait(delay) if delay > 0
+          break if @engine.closed?
+          begin
+            @engine.transport_for(@endpoint).connect(@endpoint, @engine)
+            break
+          rescue *CONNECTION_LOST, *CONNECTION_FAILED, Protocol::ZMTP::Error
+            delay = next_delay(delay, max_delay)
+            @engine.emit_monitor_event(:connect_retried, endpoint: @endpoint, detail: { interval: delay })
+          end
+        end
+      end
+
+
       # Wall-clock quantized sleep: wait until the next +delay+-sized
       # grid tick. Multiple clients reconnecting with the same interval
       # wake up at the same instant, collapsing staggered retries into

data/lib/omq/transport/tcp.rb

@@ -57,12 +57,23 @@ module OMQ
         #
         def connect(endpoint, engine)
           host, port = self.parse_endpoint(endpoint)
-          sock = TCPSocket.new(host, port)
+          sock = ::Socket.tcp(host, port, connect_timeout: connect_timeout(engine.options))
           apply_buffer_sizes(sock, engine.options)
           engine.handle_connected(IO::Stream::Buffered.wrap(sock), endpoint: endpoint)
         end
 
 
+        # Connect timeout: cap each attempt at the reconnect interval so a
+        # hung connect(2) (e.g. macOS kqueue + IPv6 ECONNREFUSED not delivered)
+        # doesn't block the retry loop. Floor at 0.5s for real-network latency.
+        #
+        def connect_timeout(options)
+          ri = options.reconnect_interval
+          ri = ri.end if ri.is_a?(Range)
+          [ri, 0.5].max
+        end
+
+
         # Parses a TCP endpoint URI into host and port.
         #
         # @param endpoint [String]

data/lib/omq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OMQ
-  VERSION = "0.17.2"
+  VERSION = "0.17.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.4
 platform: ruby
 authors:
 - Patrik Wenger