protocol-zmtp 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eac99ed3115e12e24bfc7545fd235cbeddecf9acbf6e80363247f6d85c1ed37
-  data.tar.gz: 58f81f079d7b5785baf7fa8b15f00224ac93c9505ed2f0b00d9f6bcc12147f55
+  metadata.gz: dafca992ff161d0cdb81664bfc85fd7f9194517222dcb5d11426a35c6a5f1c38
+  data.tar.gz: 9176b6c3090ef6ccaab8c37bb95d00f781a91c38a57606f08215ccaaf835726c
 SHA512:
-  metadata.gz: ff813236409d769b319b712c120995ed1bbf5e0c51dcb772a9a3e86f3130a379a1aac64843425e67a76277f91e4c74b44450b4fbe60e5a8f1173bdefa051d50c
-  data.tar.gz: 208791933fd0006915a7155ba0a18c32ec81f84854df0d77f39314e598fcc4fad3b1eb69cc341365685a3eae55928c662d767bce4331d5958c2e8d8039e84fc5
+  metadata.gz: 0aeecc4dd2454e4953ca64a5211aae337cc05846a348434f90cecd258495aefcac9489dc264df65dcbe9e7d0c266436ecdca355c80a8e4423a4b6c052d904f91
+  data.tar.gz: f725b19d48b976315b64e2c1f44663f0454db080a737de074f84a77122e623e8673afb7d662627972d680b6b9af7c209aab90c4c95a1a2654706b5daefe89dd9

data/lib/protocol/zmtp/codec/frame.rb

@@ -52,13 +52,28 @@ module Protocol
           end
         end
 
+        # Encodes a multi-part message into a single wire-format string.
+        # The result can be written to multiple connections without
+        # re-encoding each time (useful for fan-out patterns like PUB).
+        #
+        # @param parts [Array<String>] message frames
+        # @return [String] frozen binary wire representation
+        #
+        def self.encode_message(parts)
+          buf = +""
+          parts.each_with_index do |part, i|
+            buf << new(part, more: i < parts.size - 1).to_wire
+          end
+          buf.freeze
+        end
+
         # Reads one frame from an IO-like object.
         #
         # @param io [#read_exactly] must support read_exactly(n)
         # @return [Frame]
         # @raise [Error] on invalid frame
         # @raise [EOFError] if the connection is closed
-        def self.read_from(io)
+        def self.read_from(io, max_message_size: nil)
           flags = io.read_exactly(1).getbyte(0)
 
           more    = (flags & FLAGS_MORE) != 0
@@ -71,6 +86,10 @@ module Protocol
                    io.read_exactly(1).getbyte(0)
                  end
 
+          if max_message_size && size > max_message_size
+            raise Error, "frame size #{size} exceeds max_message_size #{max_message_size}"
+          end
+
           body = size > 0 ? io.read_exactly(size) : "".b
 
           new(body, more: more, command: command)

data/lib/protocol/zmtp/connection.rb

@@ -91,6 +91,26 @@ module Protocol
         end
       end
 
+      # Writes pre-encoded wire bytes to the buffer without flushing.
+      # Used for fan-out: encode once, write to many connections.
+      #
+      # @param wire_bytes [String] ZMTP wire-format bytes
+      # @return [void]
+      def write_wire(wire_bytes)
+        @mutex.synchronize do
+          @io.write(wire_bytes)
+        end
+      end
+
+      # Returns true if the ZMTP mechanism encrypts at the frame level
+      # (e.g. CURVE). TLS encryption is below ZMTP and does not affect
+      # wire-format bytes.
+      #
+      # @return [Boolean]
+      def curve?
+        @mechanism.encrypted?
+      end
+
       # Flushes the write buffer to the underlying IO.
       def flush
         @mutex.synchronize do
@@ -140,18 +160,18 @@ module Protocol
       # @raise [EOFError] if connection is closed
       def read_frame
         loop do
-          frame = Codec::Frame.read_from(@io)
+          begin
+            frame = Codec::Frame.read_from(@io, max_message_size: @max_message_size)
+          rescue Error
+            close
+            raise
+          end
           touch_heartbeat
 
           if @mechanism.encrypted? && frame.body.bytesize > 8 && frame.body.byteslice(0, 8) == "\x07MESSAGE".b
             frame = @mechanism.decrypt(frame)
           end
 
-          if @max_message_size && !frame.command? && frame.body.bytesize > @max_message_size
-            close
-            raise Error, "frame size #{frame.body.bytesize} exceeds max_message_size #{@max_message_size}"
-          end
-
           if frame.command?
             cmd = Codec::Command.from_body(frame.body)
             case cmd.name

data/lib/protocol/zmtp/version.rb

@@ -2,6 +2,6 @@
 
 module Protocol
   module ZMTP
-    VERSION = "0.1.0"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-zmtp
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Patrik Wenger