omq-cli 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 887b1bd4a69ddbbcc0d4885c05c277f32285253e7d7163407ace5451ff87ba08
-  data.tar.gz: 241d25d7b9e9be0a9ea59efb8a1f92c3f9667fafd73087763347a337c84d9299
+  metadata.gz: 1e8af323d98f0d387b86918d92e0720acfeffc27d0d9880f51fe9a3bc27d364b
+  data.tar.gz: a0c3c26481fbb2c4267438dbbf5ba48bd5805079b834efa289538f79eb42b5a0
 SHA512:
-  metadata.gz: d536665684b7c77cf5a724d057bf534b93dc19e5d0f2f9fa5035d384131353fd930b453b5e6417ca90bfa77a5a304a6759a6ae85de807e402b1ee07e5d78b033
-  data.tar.gz: 214a3d68093f7ac1e04a2a3b7e0438459ce826907dd0ee5baab2ed86c6bc5f571b26eb332d91383e6935e893f41344f5e656d4286e930022a20ae43a48b61ac0
+  metadata.gz: bc936835411067ac766d7c7926926a5ebee961c03f2faf151ae4714e44ff5bbf7f95472a2ee5d6cb9ddf3e066544904b9cc535573ce07e7988ded44c706159f9
+  data.tar.gz: a362663c0f58b056ef2a753eca530c71e01f2911cabc77536b246852220dbd140c9e5f982c28800c8fffed8cc50f2b133ee0f0b9f3c2f7a0249902874d552b99

data/CHANGELOG.md

@@ -1,9 +1,44 @@
 # Changelog
 
+## 0.4.0 — 2026-04-07
+
+### Added
+
+- **`--sndbuf` / `--rcvbuf` options** — set `SO_SNDBUF` and `SO_RCVBUF` kernel
+  buffer sizes. Accepts plain bytes or suffixed values (`4K`, `1M`).
+- **Pipe FIFO ordering system test** — verifies sequential source batches are
+  never interleaved through a pipe.
+- **Pipe producer-first system test** — verifies messages are delivered when
+  the producer finishes before the consumer connects.
+
+### Changed
+
+- **Message traces moved to monitor events** — `-vvv` traces now use
+  `Socket#monitor(verbose: true)` instead of inline `trace_send`/`trace_recv`
+  calls, ensuring correct ordering with connection lifecycle events.
+
+### Fixed
+
+- **Test helper `make_config`** — added missing `send_hwm`, `recv_hwm`,
+  `sndbuf`, `rcvbuf` fields and changed `verbose` default from `false` to `0`.
+
 ## 0.3.1 — 2026-04-07
 
+### Added
+
+- **`--send-hwm` / `--recv-hwm` options** — set send and receive high water
+  marks from the command line (default 1000, 0 = unbounded).
+- **`OMQ_DEBUG` env var** — starts async-debug web UI on
+  `https://localhost:5050` (or custom port via `OMQ_DEBUG=PORT`).
+- **Multi-level verbosity** — `-v` prints endpoints, `-vv` logs all
+  connection events (connect/disconnect/retry/timeout) via socket monitor,
+  `-vvv` also traces first 10 bytes of every sent/received message.
+
 ### Fixed
 
+- **`omq pipe` slow reconnection** — sequential `peer_connected.wait` calls
+  blocked receiving until both PULL and PUSH peers connected in order. Now
+  waits concurrently using `Kernel#Barrier`.
 - **`-i` on recv-only sockets** — `pull -i 0.2` rate-limits receiving to
   one message every 200 ms using `Async::Loop.quantized`. Works on all
   recv-only socket types (pull, sub, gather, dish).

data/lib/omq/cli/base_runner.rb

@@ -25,6 +25,7 @@ module OMQ
       # @return [void]
       def call(task)
         setup_socket
+        start_event_monitor if config.verbose >= 2
         maybe_start_transient_monitor(task)
         sleep(config.delay) if config.delay && config.recv_only?
         wait_for_peer if needs_peer_wait?
@@ -63,7 +64,7 @@ module OMQ
 
 
       def attach_endpoints
-        SocketSetup.attach(@sock, config, verbose: config.verbose)
+        SocketSetup.attach(@sock, config, verbose: config.verbose >= 1)
       end
 
 
@@ -424,7 +425,42 @@ module OMQ
 
 
       def log(msg)
-        $stderr.puts(msg) if config.verbose
+        $stderr.write("#{msg}\n") if config.verbose >= 1
+      end
+
+
+      # -vv: log connect/disconnect/retry/timeout events via Socket#monitor
+      # -vvv: also log message sent/received traces
+      def start_event_monitor
+        verbose = config.verbose >= 3
+        @sock.monitor(verbose: verbose) do |event|
+          case event.type
+          when :message_sent
+            $stderr.write("omq: >> #{msg_preview(event.detail[:parts])}\n")
+          when :message_received
+            $stderr.write("omq: << #{msg_preview(event.detail[:parts])}\n")
+          else
+            ep = event.endpoint ? " #{event.endpoint}" : ""
+            detail = event.detail ? " #{event.detail}" : ""
+            $stderr.write("omq: #{event.type}#{ep}#{detail}\n")
+          end
+        end
+      end
+
+
+      def msg_preview(parts)
+        parts.map { |p| preview_bytes(p) }.join(" | ")
+      end
+
+
+      def preview_bytes(str)
+        bytes = str.b
+        preview = bytes[0, 10].gsub(/[^[:print:]]/, ".")
+        if bytes.bytesize > 10
+          "#{preview}... (#{bytes.bytesize}B)"
+        else
+          preview
+        end
       end
     end
   end

data/lib/omq/cli/cli_parser.rb

@@ -213,13 +213,17 @@ module OMQ
         linger:           5,
         reconnect_ivl:    nil,
         heartbeat_ivl:    nil,
+        send_hwm:         nil,
+        recv_hwm:         nil,
+        sndbuf:           nil,
+        rcvbuf:           nil,
         conflate:         false,
         compress:         false,
         send_expr:        nil,
         recv_expr:        nil,
         parallel:         nil,
         transient:        false,
-        verbose:          false,
+        verbose:          0,
         quiet:            false,
         echo:             false,
         scripts:          [],
@@ -336,6 +340,10 @@ module OMQ
           }
           o.on("--heartbeat-ivl SECS", Float, "ZMTP heartbeat interval (detects dead peers)") { |v| opts[:heartbeat_ivl] = v }
           o.on("--recv-maxsz COUNT", Integer, "Max inbound message size in bytes (larger messages dropped)") { |v| opts[:recv_maxsz] = v }
+          o.on("--send-hwm N", Integer, "Send high water mark (default 1000, 0=unbounded)") { |v| opts[:send_hwm] = v }
+          o.on("--recv-hwm N", Integer, "Recv high water mark (default 1000, 0=unbounded)") { |v| opts[:recv_hwm] = v }
+          o.on("--sndbuf N", "SO_SNDBUF kernel buffer size (e.g. 4K, 1M)") { |v| opts[:sndbuf] = parse_byte_size(v) }
+          o.on("--rcvbuf N", "SO_RCVBUF kernel buffer size (e.g. 4K, 1M)") { |v| opts[:rcvbuf] = parse_byte_size(v) }
 
           o.separator "\nDelivery:"
           o.on("--conflate", "Keep only last message per subscriber (PUB/RADIO)") { opts[:conflate] = true }
@@ -363,7 +371,7 @@ module OMQ
           o.separator "            OMQ_CURVE_CRYPTO (backend: rbnacl or nuckle)"
 
           o.separator "\nOther:"
-          o.on("-v", "--verbose",   "Print connection events to stderr") { opts[:verbose] = true }
+          o.on("-v", "--verbose",   "Verbosity: -v endpoints, -vv events, -vvv messages") { opts[:verbose] += 1 }
           o.on("-q", "--quiet",     "Suppress message output")           { opts[:quiet] = true }
           o.on(      "--transient", "Exit when all peers disconnect")    { opts[:transient] = true }
           o.on("-V", "--version") {
@@ -413,6 +421,25 @@ module OMQ
       end
 
 
+      # Parses a byte size string with optional K/M suffix.
+      #
+      # @param str [String] e.g. "4096", "4K", "1M"
+      # @return [Integer] size in bytes
+      #
+      def parse_byte_size(str)
+        case str
+        when /\A(\d+)[kK]\z/
+          $1.to_i * 1024
+        when /\A(\d+)[mM]\z/
+          $1.to_i * 1024 * 1024
+        when /\A\d+\z/
+          str.to_i
+        else
+          abort "invalid byte size: #{str} (use e.g. 4096, 4K, 1M)"
+        end
+      end
+
+
       # Validates option combinations, aborting on invalid combos.
       #
       # @param opts [Hash] parsed options from {#parse}
@@ -464,6 +491,14 @@ module OMQ
         (opts[:connects] + opts[:binds]).each do |url|
           abort "inproc not supported, use tcp:// or ipc://" if url.include?("inproc://")
         end
+
+        all_urls = if type_name == "pipe"
+                     (opts[:in_endpoints] + opts[:out_endpoints] + opts[:endpoints]).map(&:url)
+                   else
+                     opts[:connects] + opts[:binds]
+                   end
+        dups = all_urls.tally.select { |_, n| n > 1 }.keys
+        abort "duplicate endpoint: #{dups.first}" if dups.any?
       end
     end
   end

data/lib/omq/cli/config.rb

@@ -38,6 +38,10 @@ module OMQ
       :linger,
       :reconnect_ivl,
       :heartbeat_ivl,
+      :send_hwm,
+      :recv_hwm,
+      :sndbuf,
+      :rcvbuf,
       :conflate,
       :compress,
       :send_expr,

data/lib/omq/cli/pipe.rb

@@ -42,7 +42,7 @@ module OMQ
 
 
       def attach_endpoints(sock, endpoints)
-        SocketSetup.attach_endpoints(sock, endpoints)
+        SocketSetup.attach_endpoints(sock, endpoints, verbose: config.verbose >= 1)
       end
 
 
@@ -58,9 +58,12 @@ module OMQ
         )
         compile_expr
         @sock = @pull  # for eval instance_exec
+        start_event_monitors if config.verbose >= 2
         with_timeout(config.timeout) do
-          @push.peer_connected.wait
-          @pull.peer_connected.wait
+          Barrier do |barrier|
+            barrier.async(annotation: "wait push peer") { @push.peer_connected.wait }
+            barrier.async(annotation: "wait pull peer") { @pull.peer_connected.wait }
+          end
         end
         setup_sequential_transient(task)
         @sock.instance_exec(&@recv_begin_proc) if @recv_begin_proc
@@ -72,17 +75,21 @@ module OMQ
       end
 
 
-      def apply_socket_intervals(sock)
+      def apply_socket_options(sock)
         sock.reconnect_interval = config.reconnect_ivl if config.reconnect_ivl
         sock.heartbeat_interval = config.heartbeat_ivl if config.heartbeat_ivl
+        sock.send_hwm           = config.send_hwm      if config.send_hwm
+        sock.recv_hwm           = config.recv_hwm      if config.recv_hwm
+        sock.sndbuf             = config.sndbuf        if config.sndbuf
+        sock.rcvbuf             = config.rcvbuf        if config.rcvbuf
       end
 
 
       def build_pull_push(pull_opts, push_opts, in_eps, out_eps)
         pull = OMQ::PULL.new(**pull_opts)
         push = OMQ::PUSH.new(**push_opts)
-        apply_socket_intervals(pull)
-        apply_socket_intervals(push)
+        apply_socket_options(pull)
+        apply_socket_options(push)
         attach_endpoints(pull, in_eps)
         attach_endpoints(push, out_eps)
         [pull, push]
@@ -107,7 +114,10 @@ module OMQ
           break if parts.nil?
           parts = @fmt.decompress(parts)
           parts = eval_recv_expr(parts)
-          @push.send(@fmt.compress(parts)) if parts && !parts.empty?
+          if parts && !parts.empty?
+            out = @fmt.compress(parts)
+            @push.send(out)
+          end
           i += 1
           break if n && n > 0 && i >= n
         end
@@ -143,9 +153,11 @@ module OMQ
 
       def wait_for_pairs(pairs)
         with_timeout(config.timeout) do
-          pairs.each do |pull, push|
-            push.peer_connected.wait
-            pull.peer_connected.wait
+          Barrier do |barrier|
+            pairs.each do |pull, push|
+              barrier.async(annotation: "wait push peer") { push.peer_connected.wait }
+              barrier.async(annotation: "wait pull peer") { pull.peer_connected.wait }
+            end
           end
         end
       end
@@ -245,7 +257,7 @@ module OMQ
         workers.each do |w|
           w.value
         rescue Ractor::RemoteError => e
-          $stderr.puts "omq: Ractor error: #{e.cause&.message || e.message}"
+          $stderr.write("omq: Ractor error: #{e.cause&.message || e.message}\n")
         end
       end
 
@@ -277,7 +289,35 @@ module OMQ
 
 
       def log(msg)
-        $stderr.puts(msg) if config.verbose
+        $stderr.write("#{msg}\n") if config.verbose >= 1
+      end
+
+
+      def start_event_monitors
+        verbose = config.verbose >= 3
+        [@pull, @push].each do |sock|
+          sock.monitor(verbose: verbose) do |event|
+            case event.type
+            when :message_sent
+              $stderr.write("omq: >> #{msg_preview(event.detail[:parts])}\n")
+            when :message_received
+              $stderr.write("omq: << #{msg_preview(event.detail[:parts])}\n")
+            else
+              ep = event.endpoint ? " #{event.endpoint}" : ""
+              detail = event.detail ? " #{event.detail}" : ""
+              $stderr.write("omq: #{event.type}#{ep}#{detail}\n")
+            end
+          end
+        end
+      end
+
+
+      def msg_preview(parts)
+        parts.map { |p|
+          bytes = p.b
+          preview = bytes[0, 10].gsub(/[^[:print:]]/, ".")
+          bytes.bytesize > 10 ? "#{preview}... (#{bytes.bytesize}B)" : preview
+        }.join(" | ")
       end
     end
   end

data/lib/omq/cli/socket_setup.rb

@@ -15,6 +15,10 @@ module OMQ
         sock.recv_timeout      = config.timeout    if config.timeout
         sock.send_timeout      = config.timeout    if config.timeout
         sock.max_message_size  = config.recv_maxsz if config.recv_maxsz
+        sock.send_hwm            = config.send_hwm       if config.send_hwm
+        sock.recv_hwm            = config.recv_hwm       if config.recv_hwm
+        sock.sndbuf              = config.sndbuf         if config.sndbuf
+        sock.rcvbuf              = config.rcvbuf         if config.rcvbuf
         sock.reconnect_interval  = config.reconnect_ivl if config.reconnect_ivl
         sock.heartbeat_interval  = config.heartbeat_ivl if config.heartbeat_ivl
         sock.identity            = config.identity      if config.identity
@@ -40,8 +44,16 @@ module OMQ
       # Bind/connect +sock+ from an Array of Endpoint objects.
       # Used by PipeRunner, which works with structured endpoint lists.
       #
-      def self.attach_endpoints(sock, endpoints)
-        endpoints.each { |ep| ep.bind? ? sock.bind(ep.url) : sock.connect(ep.url) }
+      def self.attach_endpoints(sock, endpoints, verbose: false)
+        endpoints.each do |ep|
+          if ep.bind?
+            sock.bind(ep.url)
+            $stderr.puts "Bound to #{sock.last_endpoint}" if verbose
+          else
+            sock.connect(ep.url)
+            $stderr.puts "Connecting to #{ep.url}" if verbose
+          end
+        end
       end
 
 
@@ -66,7 +78,7 @@ module OMQ
 
         return unless server_key_z85 || server_mode
 
-        crypto = CLI.load_curve_crypto(config.curve_crypto || ENV["OMQ_CURVE_CRYPTO"], verbose: config.verbose)
+        crypto = CLI.load_curve_crypto(config.curve_crypto || ENV["OMQ_CURVE_CRYPTO"], verbose: config.verbose >= 1)
         require "protocol/zmtp/mechanism/curve"
 
         if server_key_z85

data/lib/omq/cli/version.rb

@@ -2,6 +2,6 @@
 
 module OMQ
   module CLI
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/omq/cli.rb

@@ -204,11 +204,19 @@ module OMQ
       trap("INT")  { Process.exit!(0) }
       trap("TERM") { Process.exit!(0) }
 
-      Console.logger = Console::Logger.new(Console::Output::Null.new) unless config.verbose
+      Console.logger = Console::Logger.new(Console::Output::Null.new) unless config.verbose >= 1
+
+      debug_ep = nil
+
+      if ENV["OMQ_DEBUG_URI"]
+        require "async/debug"
+        debug_ep = Async::HTTP::Endpoint.parse ENV["OMQ_DEBUG_URI"]
+      end
 
       if config.type_name.nil?
         Object.include(OMQ) unless Object.include?(OMQ)
-        Async do
+        Async annotation: 'omq' do
+          Async::Debug.serve(endpoint: debug_ep) if debug_ep
           config.scripts.each { |s| load_script(s) }
         rescue => e
           $stderr.puts "omq: #{e.message}"
@@ -219,7 +227,8 @@ module OMQ
 
       runner_class, socket_sym = RUNNER_MAP.fetch(config.type_name)
 
-      Async do |task|
+      Async annotation: "omq #{config.type_name}" do |task|
+        Async::Debug.serve(endpoint: debug_ep) if debug_ep
         config.scripts.each { |s| load_script(s) }
         runner = if socket_sym
                    runner_class.new(config, OMQ.const_get(socket_sym))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Patrik Wenger
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: omq-ractor
   requirement: !ruby/object:Gem::Requirement