omq 0.22.1 → 0.24.0

data/lib/omq/engine/recv_pump.rb

@@ -4,7 +4,7 @@ module OMQ
   class Engine
     # Recv pump for a connection.
     #
-    # For inproc DirectPipe: wires the direct recv path (no fiber spawned).
+    # For inproc Pipe: wires the direct recv path (no fiber spawned).
     # For TCP/IPC: spawns a transient task that reads messages from the
     # connection and enqueues them into +recv_queue+.
     #
@@ -29,7 +29,7 @@ module OMQ
       # Public entry point — callers use the class method.
       #
       # @param parent [Async::Task, Async::Barrier] parent to spawn under
-      # @param conn [Connection, Transport::Inproc::DirectPipe]
+      # @param conn [Protocol::ZMTP::Connection, Transport::Inproc::Pipe]
       # @param recv_queue [Async::LimitedQueue]
       # @param engine [Engine]
       # @param transform [Proc, nil]
@@ -40,7 +40,7 @@ module OMQ
       end
 
 
-      # @param conn [Connection, Transport::Inproc::DirectPipe]
+      # @param conn [Protocol::ZMTP::Connection, Transport::Inproc::Pipe]
       # @param recv_queue [Async::LimitedQueue]
       # @param engine [Engine]
       #
@@ -52,7 +52,7 @@ module OMQ
       end
 
 
-      # Starts the recv pump. For inproc DirectPipe, wires the direct path
+      # Starts the recv pump. For inproc Pipe, wires the direct path
       # (no task spawned). For TCP/IPC, spawns a fiber that reads messages.
       #
       # @param parent_task [Async::Task]
@@ -60,9 +60,8 @@ module OMQ
       # @return [Async::Task, nil]
       #
       def start(parent_task, transform)
-        if @conn.is_a?(Transport::Inproc::DirectPipe) && @conn.peer
-          @conn.peer.direct_recv_queue     = @recv_queue
-          @conn.peer.direct_recv_transform = transform
+        if @conn.is_a?(Transport::Inproc::Pipe) && @conn.peer
+          @conn.peer.wire_direct_recv(@recv_queue, transform)
           return nil
         end
 
@@ -73,6 +72,7 @@ module OMQ
         end
       end
 
+
       private
 
 
@@ -94,7 +94,7 @@ module OMQ
 
             while count < FAIRNESS_MESSAGES && bytes < FAIRNESS_BYTES
               msg = conn.receive_message
-              msg = transform.call(msg).freeze
+              msg = transform.call(msg)
 
               # Emit the verbose trace BEFORE enqueueing so the monitor
               # fiber is woken before the application fiber -- the
@@ -125,7 +125,7 @@ module OMQ
         rescue Protocol::ZMTP::Error, *CONNECTION_LOST => error
           # expected disconnect — stash reason for the :disconnected
           # monitor event, let the lifecycle reconnect as usual
-          engine.connections[conn]&.record_disconnect_reason(error)
+          engine.record_disconnect_reason(conn, error)
         rescue => error
           engine.signal_fatal_error(error)
         end
@@ -172,7 +172,7 @@ module OMQ
         rescue Protocol::ZMTP::Error, *CONNECTION_LOST => error
           # expected disconnect — stash reason for the :disconnected
           # monitor event, let the lifecycle reconnect as usual
-          engine.connections[conn]&.record_disconnect_reason(error)
+          engine.record_disconnect_reason(conn, error)
         rescue => error
           engine.signal_fatal_error(error)
         end

data/lib/omq/engine/socket_lifecycle.rb

@@ -28,11 +28,11 @@ module OMQ
 
 
       TRANSITIONS = {
-        new:     %i[open closed].freeze,
-        open:    %i[closing closed].freeze,
-        closing: %i[closed].freeze,
-        closed:  [].freeze,
-      }.freeze
+        new:     %i[open closed],
+        open:    %i[closing closed],
+        closing: %i[closed],
+        closed:  [],
+      }.transform_values(&:freeze).freeze
 
 
       # @return [Symbol]
@@ -74,8 +74,8 @@ module OMQ
         @peer_connected    = Async::Promise.new
         @all_peers_gone    = Async::Promise.new
         @reconnect_enabled = true
-        @parent_task       = nil
         @on_io_thread      = false
+        @parent_task       = nil
         @barrier           = nil
       end
 
@@ -106,6 +106,7 @@ module OMQ
       #
       def capture_parent_task(parent: nil, linger:)
         return false if @parent_task
+
         if parent
           @parent_task  = parent
         elsif Async::Task.current?
@@ -115,6 +116,7 @@ module OMQ
           @on_io_thread = true
           Reactor.track_linger(linger)
         end
+
         @barrier = Async::Barrier.new(parent: @parent_task)
         transition!(:open)
         true
@@ -134,10 +136,23 @@ module OMQ
       end
 
 
-      # Resolves `all_peers_gone` if we had peers and now have none.
+      # Hard close from any alive state — used by {Engine#stop}'s crash
+      # path, which skips the linger drain. Goes `:open → :closed`
+      # directly when needed.
+      def force_close!
+        transition!(:closed)
+      end
+
+
+      # Resolves `all_peers_gone` once we had peers and the connection map
+      # is empty. Called by {Engine#maybe_resolve_all_peers_gone} after a
+      # teardown removes a peer.
+      #
       # @param connections [Hash] current connection map
-      def resolve_all_peers_gone_if_empty(connections)
-        return unless @peer_connected.resolved? && connections.empty?
+      def maybe_resolve_all_peers_gone(connections)
+        return unless @peer_connected.resolved?
+        return unless connections.empty?
+
         @all_peers_gone.resolve(true)
       end
 
@@ -147,9 +162,11 @@ module OMQ
 
       def transition!(new_state)
         allowed = TRANSITIONS[@state]
+
         unless allowed&.include?(new_state)
           raise InvalidTransition, "#{@state} → #{new_state}"
         end
+
         @state = new_state
       end