omq 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27a1d700594261a36d3212b00ff84e15be3053a32db07a04a48aa0eb52fec902
-  data.tar.gz: 2797e4863af5cfcde9fe446c79929705e6ab17656ba016532b54d6c6b57564b9
+  metadata.gz: d49a1c7caa7a1548615285ae294341b31833fd02bb60a7fa7cbfc0ed5c707d79
+  data.tar.gz: db36537c5dab13faa9cbdbe611c282cbf9dd96726e88145f80c3aaa7bf3df8a5
 SHA512:
-  metadata.gz: a116b039dc996a0099bbb86e8c138fd71f03051bd23c142b653e1c8e932e541245476bed51a47183ecb3723f9f86b30f36b6e3956b77494f8d77c924354f39ad
-  data.tar.gz: bdd7a62bb68390c942ebb1517981ca69d0efab007f3be7d3149fcccb525ad9b2cb279689ba2ec640db0f6057d6d7219e804074bb5ba4eb4d8339517bf6de5805
+  metadata.gz: 3e3a9e5a0b9ee3857a2946e7468ea2ca30c87544fa75965c79b1ea905c3a8d969aeb94b49282acd502d2ffbb6a0db5b2952f7a18a17e90363f1c5ed13cfbecd4
+  data.tar.gz: 1cb5f13312278d55684f22c420f17287a922633eebdfd143336415aafdc725dd7a38e23b5f9387cc55bf28acc0b125840c5770ef9112556b97b7c3cca8578ee6

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.4.0 — 2026-03-27
+
+### Added (omqcat)
+
+- `--curve-server` flag — generates ephemeral keypair, prints
+  `OMQ_SERVER_KEY=...` to stderr for easy copy-paste
+- `--curve-server-key KEY` flag — CURVE client mode from the CLI
+- `--echo` flag for REP — explicit echo mode
+- REP reads stdin/`-F` as reply source (one line per reply, exits at EOF)
+- REP without a reply source now aborts with a helpful error message
+
+### Changed
+
+- CURVE env vars renamed: `OMQ_SERVER_KEY`, `OMQ_SERVER_PUBLIC`,
+  `OMQ_SERVER_SECRET` (was `SERVER_KEY`, `SERVER_PUBLIC`, `SERVER_SECRET`)
+- REP with `--echo`/`-D`/`-e` serves forever by default (like a server).
+  Use `-n 1` for one-shot, `-n` to limit exchanges. Stdin/`-F` replies
+  naturally terminate at EOF.
+
 ## 0.3.2 — 2026-03-26
 
 ### Improved

data/exe/omqcat

@@ -30,7 +30,7 @@ opts = {
   identity:     nil,
   target:       nil,
   interval:     nil,
-  count:        0,
+  count:        nil,
   delay:        nil,
   recv_timeout: nil,
   send_timeout: nil,
@@ -48,7 +48,8 @@ parser = OptionParser.new do |o|
   o.on("-c", "--connect URL", "Connect to endpoint (repeatable)")   { |v| opts[:connects] << v }
   o.on("-b", "--bind URL",    "Bind to endpoint (repeatable)")      { |v| opts[:binds] << v }
 
-  o.separator "\nData source:"
+  o.separator "\nData source (REP: reply source):"
+  o.on(      "--echo",        "Echo received messages back (REP)")   { opts[:echo] = true }
   o.on("-D", "--data DATA",   "Message data (literal string)")      { |v| opts[:data] = v }
   o.on("-F", "--file FILE",   "Read message from file (- = stdin)") { |v| opts[:file] = v }
 
@@ -80,6 +81,11 @@ parser = OptionParser.new do |o|
   o.on("-e", "--eval EXPR", "Eval Ruby for each message ($F = parts)") { |v| opts[:expr] = v }
   o.on("-r", "--require LIB", "Require a Ruby library (repeatable)")   { |v| require v }
 
+  o.separator "\nCURVE encryption (requires omq-curve gem):"
+  o.on("--curve-server",         "Enable CURVE as server (generates keypair)") { opts[:curve_server] = true }
+  o.on("--curve-server-key KEY", "Enable CURVE as client (server's Z85 public key)") { |v| opts[:curve_server_key] = v }
+  o.separator "  Env vars: OMQ_SERVER_KEY (client), OMQ_SERVER_PUBLIC + OMQ_SERVER_SECRET (server)"
+
   o.separator "\nOther:"
   o.on("-v", "--verbose", "Print connection events to stderr") { opts[:verbose] = true }
   o.on("-q", "--quiet",   "Suppress message output")           { opts[:quiet] = true }
@@ -216,21 +222,31 @@ end
 
 # ── CURVE setup ─────────────────────────────────────────────────────
 
-def setup_curve(sock)
-  if ENV["SERVER_KEY"]
+def setup_curve(sock, opts)
+  server_key_z85 = opts[:curve_server_key] || ENV["OMQ_SERVER_KEY"]
+  server_mode    = opts[:curve_server] || (ENV["OMQ_SERVER_PUBLIC"] && ENV["OMQ_SERVER_SECRET"])
+
+  if server_key_z85
+    # Client mode
     require "omq/curve"
-    server_key = OMQ::Z85.decode(ENV["SERVER_KEY"])
+    server_key = OMQ::Z85.decode(server_key_z85)
     client_key = RbNaCl::PrivateKey.generate
     sock.mechanism = OMQ::Curve.client(
       client_key.public_key.to_s, client_key.to_s, server_key: server_key
     )
-    $stderr.puts "CURVE client mode" if $VERBOSE
-  elsif ENV["SERVER_PUBLIC"] && ENV["SERVER_SECRET"]
+  elsif server_mode
+    # Server mode
     require "omq/curve"
-    server_pub = OMQ::Z85.decode(ENV["SERVER_PUBLIC"])
-    server_sec = OMQ::Z85.decode(ENV["SERVER_SECRET"])
+    if ENV["OMQ_SERVER_PUBLIC"] && ENV["OMQ_SERVER_SECRET"]
+      server_pub = OMQ::Z85.decode(ENV["OMQ_SERVER_PUBLIC"])
+      server_sec = OMQ::Z85.decode(ENV["OMQ_SERVER_SECRET"])
+    else
+      key        = RbNaCl::PrivateKey.generate
+      server_pub = key.public_key.to_s
+      server_sec = key.to_s
+    end
     sock.mechanism = OMQ::Curve.server(server_pub, server_sec)
-    $stderr.puts "SERVER_KEY=#{ENV["SERVER_PUBLIC"]}"
+    $stderr.puts "OMQ_SERVER_KEY='#{OMQ::Z85.encode(server_pub)}'"
   end
 rescue LoadError
   abort "omq-curve gem required for CURVE encryption: gem install omq-curve"
@@ -281,6 +297,10 @@ def eval_expr(parts, sock, opts)
   end
 end
 
+def count_reached?(i, opts)
+  opts[:count] && opts[:count] > 0 && i >= opts[:count]
+end
+
 def output(parts, opts)
   return if opts[:quiet]
   parts = [""] if parts.nil?
@@ -304,7 +324,7 @@ def send_loop(sock, opts)
       sleep(opts[:delay]) if opts[:delay] && i == 0
       send_msg(sock, parts, opts) if parts
       i += 1
-      break if opts[:count] > 0 && i >= opts[:count]
+      break if count_reached?(i, opts)
       if opts[:interval]
         sleep(opts[:interval])
       else
@@ -319,7 +339,7 @@ def send_loop(sock, opts)
       sleep(opts[:delay]) if opts[:delay] && i == 0
       send_msg(sock, parts, opts) if parts
       i += 1
-      break if opts[:count] > 0 && i >= opts[:count]
+      break if count_reached?(i, opts)
       sleep(opts[:interval]) if opts[:interval]
     end
   end
@@ -332,7 +352,7 @@ def recv_loop(sock, opts)
     parts = eval_expr(parts, sock, opts)
     output(parts, opts)
     i += 1
-    break if opts[:count] > 0 && i >= opts[:count]
+    break if count_reached?(i, opts)
   end
 end
 
@@ -347,7 +367,7 @@ def req_loop(sock, opts)
     reply = eval_expr(reply, sock, opts)
     output(reply, opts)
     i += 1
-    break if opts[:count] > 0 && i >= opts[:count]
+    break if count_reached?(i, opts)
     if opts[:interval]
       sleep(opts[:interval])
     elsif !opts[:data] && !opts[:file]
@@ -366,13 +386,19 @@ def rep_loop(sock, opts)
       reply = eval_expr(msg, sock, opts)
       output(reply, opts)
       send_msg(sock, reply || [""], opts)
-    else
+    elsif opts[:echo]
+      output(msg, opts)
+      send_msg(sock, msg, opts)
+    elsif opts[:data] || opts[:file] || !$stdin.tty?
+      reply = read_next(opts)
+      break unless reply  # EOF on stdin/-F
       output(msg, opts)
-      reply = opts[:data] ? parse_input(opts[:data] + "\n", opts[:format]) : msg
       send_msg(sock, reply, opts)
+    else
+      abort "REP needs a reply source: --echo, --data, --file, -e, or stdin pipe"
     end
     i += 1
-    break if opts[:count] > 0 && i >= opts[:count]
+    break if count_reached?(i, opts)
   end
 end
 
@@ -384,7 +410,7 @@ def pair_loop(sock, opts, task)
       parts = eval_expr(parts, sock, opts)
       output(parts, opts)
       i += 1
-      break if opts[:count] > 0 && i >= opts[:count]
+      break if count_reached?(i, opts)
     end
   end
 
@@ -397,13 +423,13 @@ def pair_loop(sock, opts, task)
       sleep(opts[:delay]) if opts[:delay] && i == 0
       send_msg(sock, parts, opts) if parts
       i += 1
-      break if opts[:count] > 0 && i >= opts[:count]
+      break if count_reached?(i, opts)
       break if (opts[:data] || opts[:file]) && !opts[:interval]
       sleep(opts[:interval]) if opts[:interval]
     end
   end
 
-  if opts[:count] > 0
+  if opts[:count] && opts[:count] > 0
     receiver.wait
     sender.stop
   else
@@ -425,7 +451,7 @@ def router_loop(sock, opts, task)
       result = eval_expr([id_display, *parts], sock, opts)
       output(result, opts)
       i += 1
-      break if opts[:count] > 0 && i >= opts[:count]
+      break if count_reached?(i, opts)
     end
   end
 
@@ -440,7 +466,7 @@ def router_loop(sock, opts, task)
       end
       send_msg(sock, parts, opts)
       i += 1
-      break if opts[:count] > 0 && i >= opts[:count]
+      break if count_reached?(i, opts)
       break if (opts[:data] || opts[:file]) && !opts[:interval]
       sleep(opts[:interval]) if opts[:interval]
     end
@@ -448,7 +474,7 @@ def router_loop(sock, opts, task)
 
   # If count is set, the receiver will exit when count is reached.
   # Otherwise, wait for Ctrl-C.
-  if opts[:count] > 0
+  if opts[:count] && opts[:count] > 0
     receiver.wait
     sender.stop
   else
@@ -473,7 +499,7 @@ Async do |task|
   sock.send_timeout = opts[:send_timeout] if opts[:send_timeout]
   sock.identity     = opts[:identity]     if opts[:identity]
 
-  setup_curve(sock)
+  setup_curve(sock, opts)
 
   opts[:binds].each do |url|
     sock.bind(url)

data/lib/omq/version.rb

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

metadata

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