omq 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1aa0586915986b6147a3433605657386ba586a8457e1ef2e0542b89f15da8d5
-  data.tar.gz: 7d6507a015ca32b74ee3b449f29982f3d4766975628bfea13966f77d14ec8d2f
+  metadata.gz: 3357d4050a4f44b5c440026bc6ec9100cd34a64307f04fe8eab88ab219617cbc
+  data.tar.gz: b507113e3df663fbb27b805370be466795d00f0fd483e62a7936156a74047a5e
 SHA512:
-  metadata.gz: f1dfb171e7aaa086e08a4f8ea0a30e4f13883e7e1879302edfbb0ca12ecf70176369f7aabe1861efaad5867bd8dd0ea935fd8e37cd52df5974c17391145cc8eb
-  data.tar.gz: 5c33383958134a31830b4449b7de15b92ab7221597c00537ae2cea8a53bb029bf289022043acede991459a3a64d74b2cc90ed97494e7961d98a7b6b9259fdbe7
+  metadata.gz: 7d8dbffe8678966f753c0679543b7933cfe986dfd0fb7cb15be2aa824b99064f7a42e45fe73dd1e9d63e59fbaeeafe8b03f14e7a75078858d4f80d636cb3001e
+  data.tar.gz: 4ff71015d8434c0199b5c0f55312d8ee55defa7b2ae1d8dd526c6938cb20c77332a207848fbeae3e383a7d832cc305bd3030e2d36685c65483ddc1155e58bea3

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 
-## Unreleased
+## 0.15.4 — 2026-04-08
+
+- **Lazy routing initialization** — the routing strategy is now created on
+  first use (bind, connect, send, or receive) instead of eagerly in the
+  constructor. This allows socket option setters (`send_hwm=`, `recv_hwm=`)
+  to take effect before internal queue sizing.
+- **Prefetch byte limit** — `dequeue_recv_batch` now stops at 1 MB total,
+  not just 64 messages. Prevents large messages from filling the prefetch
+  buffer with hundreds of megabytes.
+- **Bound staging queue `@head`** — `StagingQueue#prepend` now drops messages
+  when at capacity, preventing unbounded growth during reconnect cycles.
+- **Bound monitor queue** — `Socket#monitor` uses a `LimitedQueue(64)` instead
+  of an unbounded queue, preventing memory growth when verbose monitoring
+  can't keep up with message rate.
+
+### Unreleased
 
 - **Auto-freeze on bind/connect** — `#bind` and `#connect` now call
   `OMQ.freeze_for_ractors!` automatically, freezing `CONNECTION_LOST`,

data/lib/omq/engine.rb

@@ -42,9 +42,11 @@ module OMQ
     attr_reader :options
 
 
-    # @return [Routing] routing strategy
+    # @return [Routing] routing strategy (created lazily on first access)
     #
-    attr_reader :routing
+    def routing
+      @routing ||= Routing.for(@socket_type).new(self)
+    end
 
 
     # @return [String, nil] last bound endpoint
@@ -63,7 +65,7 @@ module OMQ
     def initialize(socket_type, options)
       @socket_type       = socket_type
       @options           = options
-      @routing           = Routing.for(socket_type).new(self)
+      @routing           = nil
       @connections       = {} # connection => ConnectionRecord
       @dialed            = Set.new # endpoints we called connect() on (reconnect intent)
       @listeners         = []
@@ -225,7 +227,7 @@ module OMQ
       pipe = @connection_wrapper.call(pipe) if @connection_wrapper
       @connections[pipe] = ConnectionRecord.new(endpoint: endpoint, done: nil)
       emit_monitor_event(:handshake_succeeded, endpoint: endpoint)
-      @routing.connection_added(pipe)
+      routing.connection_added(pipe)
       @peer_connected.resolve(pipe)
     end
 
@@ -237,28 +239,31 @@ module OMQ
     #
     def dequeue_recv
       raise @fatal_error if @fatal_error
-      msg = @routing.recv_queue.dequeue
+      msg = routing.recv_queue.dequeue
       raise @fatal_error if msg.nil? && @fatal_error
       msg
     end
 
 
-    # Dequeues up to +max+ messages. Blocks on the first, then
-    # drains non-blocking.
+    # Dequeues up to +max+ messages or +max_bytes+ total. Blocks
+    # on the first, then drains non-blocking.
     #
-    # @param max [Integer]
+    # @param max [Integer] message count limit
+    # @param max_bytes [Integer] byte size limit
     # @return [Array<Array<String>>]
     #
-    def dequeue_recv_batch(max)
+    def dequeue_recv_batch(max, max_bytes: 1 << 20)
       raise @fatal_error if @fatal_error
-      queue = @routing.recv_queue
+      queue = routing.recv_queue
       msg   = queue.dequeue
       raise @fatal_error if msg.nil? && @fatal_error
       batch = [msg]
-      while batch.size < max
+      bytes = msg.sum(&:bytesize)
+      while batch.size < max && bytes < max_bytes
         msg = queue.dequeue(timeout: 0)
         break unless msg
         batch << msg
+        bytes += msg.sum(&:bytesize)
       end
       batch
     end
@@ -268,7 +273,7 @@ module OMQ
     # pending {#dequeue_recv} with a nil return value.
     #
     def dequeue_recv_sentinel
-      @routing.recv_queue.push(nil)
+      routing.recv_queue.push(nil)
     end
 
 
@@ -280,7 +285,7 @@ module OMQ
     #
     def enqueue_send(parts)
       raise @fatal_error if @fatal_error
-      @routing.enqueue(parts)
+      routing.enqueue(parts)
     end
 
 
@@ -305,7 +310,7 @@ module OMQ
     #
     def connection_lost(connection)
       entry = @connections.delete(connection)
-      @routing.connection_removed(connection)
+      routing.connection_removed(connection)
       connection.close
       emit_monitor_event(:disconnected, endpoint: entry&.endpoint)
       entry&.done&.resolve(true)
@@ -369,7 +374,7 @@ module OMQ
       rescue => wrapped
         wrapped
       end
-      @routing.recv_queue.push(nil) rescue nil
+      routing.recv_queue.push(nil) rescue nil
       @peer_connected.resolve(nil) rescue nil
     end
 
@@ -502,14 +507,14 @@ module OMQ
       conns = @connections.filter_map { |conn, e| conn if e.endpoint == endpoint }
       conns.each do |conn|
         @connections.delete(conn)
-        @routing.connection_removed(conn)
+        routing.connection_removed(conn)
         conn.close
       end
     end
 
 
     def stop_tasks
-      @routing.stop rescue nil
+      routing.stop rescue nil
       @tasks.each { |t| t.stop rescue nil }
       @tasks.clear
     end

data/lib/omq/routing/staging_queue.rb

@@ -12,7 +12,8 @@ module OMQ
       # @param max [Integer, nil] capacity (nil or 0 = unbounded)
       #
       def initialize(max = nil)
-        @queue = (max && max > 0) ? Async::LimitedQueue.new(max) : Async::Queue.new
+        @max   = (max && max > 0) ? max : nil
+        @queue = @max ? Async::LimitedQueue.new(@max) : Async::Queue.new
         @head  = []
         @mu    = Mutex.new
       end
@@ -30,13 +31,18 @@ module OMQ
 
 
       # Inserts a message at the front (for re-staging after a
-      # failed drain).
+      # failed drain).  Drops the message if the staging queue is
+      # already at capacity (messages sent to a peer that disconnected
+      # may be lost -- same as ZMQ).
       #
       # @param msg [Array<String>]
       # @return [void]
       #
       def prepend(msg)
-        @mu.synchronize { @head.push(msg) }
+        @mu.synchronize do
+          return if @max && @head.size >= @max
+          @head.push(msg)
+        end
       end
 
 

data/lib/omq/socket.rb

@@ -174,7 +174,7 @@ module OMQ
     #
     def monitor(verbose: false, &block)
       ensure_parent_task
-      queue = Async::Queue.new
+      queue = Async::LimitedQueue.new(64)
       @engine.monitor_queue = queue
       @engine.verbose_monitor = verbose
       Reactor.run do

data/lib/omq/version.rb

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

metadata

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