omq 0.17.3 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e319844ecfe0e7055c069267be40d71be2c5c48cd48aab400f20ec6c04524d2
-  data.tar.gz: f8292ad8abac61ff809e684aefbe60cb1e2efde6e6705355414d4fc66d956a45
+  metadata.gz: e3fe39e645fce312f16bc3a8601d73615ef0e7794057a3c521e7e971f252f1a0
+  data.tar.gz: 04d34473387abf066d2606f95008fa8c2be90f0952df0e85aea618063849fcf3
 SHA512:
-  metadata.gz: e35dbfe99e7ac18d34d2c2d6725018838e65c6df6bd35032ef206cca4f3f20b8424ad7132bc82e41d0c1d1284aceba5541de9b80b3f1b57adc5f1bb535088bc4
-  data.tar.gz: a595d1c56de6ac693c7c3f65ab872f760c0e118d37ebcf59e54527fa7c560415b648541a631cc35ca74d91a89c534305bdfe1443e1b8a8d18c3992f0be3514ec
+  metadata.gz: 76424e29263a30029e8b7d86a81e748afd490f43c26d0e8bb2d11047768cdbc8e07f3f1fe6fe3d77601e4037900af055cdb1825f2a1c3975f6d4c98cb552764f
+  data.tar.gz: '08af12564e152a4529ed2f2b0730bca14c1cb23285eac8d90a60e5681f258905762571ea43814ad5a8f717b40204e97b86273c39b5c08ee4729a563eaacf2f57'

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.17.5 — 2026-04-10
+
+### Fixed
+
+- **Handshake timeout.** `ConnectionLifecycle#handshake!` now wraps
+  the ZMTP greeting/handshake exchange with a timeout (reconnect
+  interval, floor 0.5s). Prevents a hang when a non-ZMQ service
+  accepts the TCP connection but never sends a ZMTP greeting (e.g.
+  macOS AirPlay Receiver on port 5000). On timeout the connection
+  tears down with `reconnect: true`, so the retry loop picks up.
+
+## 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

data/lib/omq/engine/connection_lifecycle.rb

@@ -82,11 +82,11 @@ module OMQ
           mechanism:        @engine.options.mechanism&.dup,
           max_message_size: @engine.options.max_message_size,
         )
-        conn.handshake!
+        Async::Task.current.with_timeout(handshake_timeout) { conn.handshake! }
         Heartbeat.start(@barrier, conn, @engine.options, @engine.tasks)
         ready!(conn)
         @conn
-      rescue Protocol::ZMTP::Error, *CONNECTION_LOST => error
+      rescue Protocol::ZMTP::Error, *CONNECTION_LOST, Async::TimeoutError => error
         @engine.emit_monitor_event(:handshake_failed, endpoint: @endpoint, detail: { error: error })
         conn&.close
         # Full tear-down with reconnect: without this, spawn_connection's
@@ -189,6 +189,18 @@ module OMQ
       end
 
 
+      # Handshake timeout: same logic as TCP.connect_timeout — derived
+      # from reconnect_interval (floor 0.5s). Prevents a hang when the
+      # peer accepts the TCP connection but never sends a ZMTP greeting
+      # (e.g. a non-ZMQ service on the same port).
+      #
+      def handshake_timeout
+        ri = @engine.options.reconnect_interval
+        ri = ri.end if ri.is_a?(Range)
+        [ri, 0.5].max
+      end
+
+
       def transition!(new_state)
         allowed = TRANSITIONS[@state]
         unless allowed&.include?(new_state)

data/lib/omq/engine/reconnect.rb

@@ -56,11 +56,9 @@ module OMQ
           sleep quantized_wait(delay) if delay > 0
           break if @engine.closed?
           begin
-            Async::Task.current.with_timeout(connect_timeout) do
-              @engine.transport_for(@endpoint).connect(@endpoint, @engine)
-            end
+            @engine.transport_for(@endpoint).connect(@endpoint, @engine)
             break
-          rescue *CONNECTION_LOST, *CONNECTION_FAILED, Protocol::ZMTP::Error, Async::TimeoutError
+          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
@@ -68,17 +66,6 @@ module OMQ
       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
-        ri = @options.reconnect_interval
-        ri = ri.end if ri.is_a?(Range)
-        [ri, 0.5].max
-      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.3"
+  VERSION = "0.17.5"
 end

metadata

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