omq 0.4.2 → 0.5.1

data/lib/omq/zmtp/routing.rb

@@ -12,6 +12,25 @@ module OMQ
     # the socket's send/recv queues.
     #
     module Routing
+      # Maximum messages to drain from the send queue per flush cycle.
+      MAX_SEND_BATCH = 64
+
+      # Drains up to +max+ additional messages from +queue+ into +batch+
+      # without blocking. Call after the initial blocking dequeue.
+      #
+      # @param queue [Async::LimitedQueue]
+      # @param batch [Array]
+      # @param max [Integer]
+      # @return [void]
+      #
+      def self.drain_send_queue(queue, batch, max = MAX_SEND_BATCH)
+        while batch.size < max
+          msg = queue.dequeue(timeout: 0)
+          break unless msg
+          batch << msg
+        end
+      end
+
       # Returns the routing strategy class for a socket type.
       #
       # @param socket_type [Symbol] e.g. :PAIR, :REQ
@@ -28,8 +47,16 @@ module OMQ
         when :SUB    then Sub
         when :XPUB   then XPub
         when :XSUB   then XSub
-        when :PUSH   then Push
-        when :PULL   then Pull
+        when :PUSH    then Push
+        when :PULL    then Pull
+        when :CLIENT  then Client
+        when :SERVER  then Server
+        when :RADIO   then Radio
+        when :DISH    then Dish
+        when :SCATTER then Scatter
+        when :GATHER  then Gather
+        when :PEER    then Peer
+        when :CHANNEL then Channel
         else raise ArgumentError, "unknown socket type: #{socket_type}"
         end
       end

data/lib/omq/zmtp/single_frame.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module OMQ
+  module ZMTP
+    # Mixin that rejects multipart messages.
+    #
+    # All draft socket types (CLIENT, SERVER, RADIO, DISH, SCATTER,
+    # GATHER, PEER, CHANNEL) require single-frame messages for
+    # thread-safe atomic operations.
+    #
+    module SingleFrame
+      def send(message)
+        if message.is_a?(Array) && message.size > 1
+          raise ArgumentError, "#{self.class} does not support multipart messages"
+        end
+        super
+      end
+    end
+  end
+end

data/lib/omq/zmtp/transport/inproc.rb

@@ -17,7 +17,7 @@ module OMQ
       module Inproc
         # Socket types that exchange commands (SUBSCRIBE/CANCEL) over inproc.
         #
-        COMMAND_TYPES = %i[PUB SUB XPUB XSUB].freeze
+        COMMAND_TYPES = %i[PUB SUB XPUB XSUB RADIO DISH].freeze
 
         # Global registry of bound inproc endpoints.
         #
@@ -262,6 +262,14 @@ module OMQ
             end
           end
 
+          alias write_message send_message
+
+          # No-op — inproc has no IO buffer to flush.
+          #
+          # @return [void]
+          #
+          def flush = nil
+
           # Receives a multi-frame message.
           #
           # @return [Array<String>]

data/lib/omq/zmtp/valid_peers.rb

@@ -14,8 +14,16 @@ module OMQ
       SUB:    %i[PUB XPUB].freeze,
       XPUB:   %i[SUB XSUB].freeze,
       XSUB:   %i[PUB XPUB].freeze,
-      PUSH:   %i[PULL].freeze,
-      PULL:   %i[PUSH].freeze,
+      PUSH:    %i[PULL].freeze,
+      PULL:    %i[PUSH].freeze,
+      CLIENT:  %i[SERVER].freeze,
+      SERVER:  %i[CLIENT].freeze,
+      RADIO:   %i[DISH].freeze,
+      DISH:    %i[RADIO].freeze,
+      SCATTER: %i[GATHER].freeze,
+      GATHER:  %i[SCATTER].freeze,
+      PEER:    %i[PEER].freeze,
+      CHANNEL: %i[CHANNEL].freeze,
     }.freeze
   end
 end

data/lib/omq/zmtp.rb

@@ -63,6 +63,15 @@ require_relative "zmtp/routing/xpub"
 require_relative "zmtp/routing/xsub"
 require_relative "zmtp/routing/push"
 require_relative "zmtp/routing/pull"
+require_relative "zmtp/routing/scatter"
+require_relative "zmtp/routing/gather"
+require_relative "zmtp/routing/channel"
+require_relative "zmtp/routing/client"
+require_relative "zmtp/routing/server"
+require_relative "zmtp/routing/radio"
+require_relative "zmtp/routing/dish"
+require_relative "zmtp/routing/peer"
+require_relative "zmtp/single_frame"
 require_relative "zmtp/engine"
 require_relative "zmtp/readable"
 require_relative "zmtp/writable"

data/lib/omq.rb

@@ -17,6 +17,11 @@ require_relative "omq/router_dealer"
 require_relative "omq/pub_sub"
 require_relative "omq/push_pull"
 require_relative "omq/pair"
+require_relative "omq/scatter_gather"
+require_relative "omq/channel"
+require_relative "omq/client_server"
+require_relative "omq/radio_dish"
+require_relative "omq/peer"
 
 # For the purists.
 ØMQ = OMQ

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omq
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Patrik Wenger
@@ -51,11 +51,16 @@ files:
 - README.md
 - exe/omqcat
 - lib/omq.rb
+- lib/omq/channel.rb
+- lib/omq/client_server.rb
 - lib/omq/pair.rb
+- lib/omq/peer.rb
 - lib/omq/pub_sub.rb
 - lib/omq/push_pull.rb
+- lib/omq/radio_dish.rb
 - lib/omq/req_rep.rb
 - lib/omq/router_dealer.rb
+- lib/omq/scatter_gather.rb
 - lib/omq/socket.rb
 - lib/omq/version.rb
 - lib/omq/zmtp.rb
@@ -70,19 +75,28 @@ files:
 - lib/omq/zmtp/reactor.rb
 - lib/omq/zmtp/readable.rb
 - lib/omq/zmtp/routing.rb
+- lib/omq/zmtp/routing/channel.rb
+- lib/omq/zmtp/routing/client.rb
 - lib/omq/zmtp/routing/dealer.rb
+- lib/omq/zmtp/routing/dish.rb
 - lib/omq/zmtp/routing/fan_out.rb
+- lib/omq/zmtp/routing/gather.rb
 - lib/omq/zmtp/routing/pair.rb
+- lib/omq/zmtp/routing/peer.rb
 - lib/omq/zmtp/routing/pub.rb
 - lib/omq/zmtp/routing/pull.rb
 - lib/omq/zmtp/routing/push.rb
+- lib/omq/zmtp/routing/radio.rb
 - lib/omq/zmtp/routing/rep.rb
 - lib/omq/zmtp/routing/req.rb
 - lib/omq/zmtp/routing/round_robin.rb
 - lib/omq/zmtp/routing/router.rb
+- lib/omq/zmtp/routing/scatter.rb
+- lib/omq/zmtp/routing/server.rb
 - lib/omq/zmtp/routing/sub.rb
 - lib/omq/zmtp/routing/xpub.rb
 - lib/omq/zmtp/routing/xsub.rb
+- lib/omq/zmtp/single_frame.rb
 - lib/omq/zmtp/transport/inproc.rb
 - lib/omq/zmtp/transport/ipc.rb
 - lib/omq/zmtp/transport/tcp.rb