protocol-zmtp 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 303ee019ebede5cddca93226c136233c19b7ec6e54cad7ef0deba5f5a5f6e347
-  data.tar.gz: 229f46c1a06f1fe7d02a3b1a518fee8958786959fa0b43fe6587d47392c9d602
+  metadata.gz: a99947180a584a86331021fac44327f3bde68cc44c50fe6264fdb7e6018cf3af
+  data.tar.gz: 00c1b152a3763603452a42b0af92455ab02cb864d55b4cd331d0dba26396f65b
 SHA512:
-  metadata.gz: 38345cf8abc4d1ed198a90abe714d15dd5cc8877fd22ba25f672c9ff4c02a36e9c7754a6c3998fc3b0cf9dd8972e54595be4c953c4e18d0acecaf3363b5971d2
-  data.tar.gz: 50c74c72d1926d1bd3756cf130d57039337f75f34c47d701b7b7a936e9f3d9b57e9f203e6b841b454b9de5d99624ada8239dbfb6e2f8cf8285ae991aa94b9828
+  metadata.gz: 6e6997a555bc1ed27bd68f51935cfc0b68bf4b7b3f5055a47b2de44f63561116b309be5d933df1ffc9e8a62d72deac7a3ed918b9b323fcb41584934a8b76a684
+  data.tar.gz: 5a495e661e2e4c829a6e33d5cb3d98a0976c4606efb676f17201a7184a82753405816d7f66057154b95a2af78c3385d960e1d0a319674945454eb2218f8c81fd

data/lib/protocol/zmtp/connection.rb

@@ -80,6 +80,7 @@ module Protocol
         # writes in place so the per-message 2-or-9 byte String allocation
         # in write_frames disappears on the hot send path.
         @header_buf = String.new(capacity: 9, encoding: Encoding::BINARY)
+        @frame_buf  = String.new(capacity: 257, encoding: Encoding::BINARY)
       end
 
 
@@ -188,6 +189,25 @@ module Protocol
       end
 
 
+      # Writes multiple pre-encoded wire byte strings under a single
+      # mutex acquisition.
+      #
+      # @param wire_strings [Array<String>]
+      # @return [void]
+      def write_wire_batch(wire_strings)
+        with_deferred_cancel do
+          @mutex.synchronize do
+            i = 0
+            n = wire_strings.size
+            while i < n
+              @io.write(wire_strings[i])
+              i += 1
+            end
+          end
+        end
+      end
+
+
       # Returns true if the ZMTP mechanism encrypts at the frame level
       # (e.g. CURVE, BLAKE3ZMQ).
       #
@@ -316,11 +336,10 @@ module Protocol
       private
 
       # Defers task cancellation around a block of wire writes so the
-      # peer never sees a half-written frame. Without this, an
-      # +Async::Cancel+ arriving between the header write and the body
-      # write (the unencrypted path issues two separate +@io.write+
-      # calls per frame) would desync the peer's framer
-      # unrecoverably.
+      # peer never sees a half-written frame or partial multipart
+      # message. Without this, an +Async::Cancel+ arriving between
+      # successive frames (or between header and body writes for long
+      # frames) would desync the peer's framer unrecoverably.
       #
       # When called outside an Async task (test fixtures, blocking
       # callers), the block runs directly -- there is no task to defer
@@ -337,15 +356,16 @@ module Protocol
 
       # Writes message parts as ZMTP frames, encrypting if needed.
       #
-      # For the unencrypted path, writes the frame header and body
-      # separately to the IO instead of allocating a wire String. This
-      # avoids copying the body just to glue a 1- or 9-byte header onto
-      # it -- significant for large messages where the body copy was
-      # the dominant allocation per send.
+      # Short frames (body <= 255 B) combine the 2-byte header and
+      # body into a reusable buffer for a single +@io.write+, halving
+      # the per-frame mutex overhead in io-stream. Long frames write
+      # header and body separately to avoid copying the body.
       def write_frames(parts)
-        encrypted = @mechanism.encrypted?
-        buf       = @header_buf
-        last      = parts.size - 1
+        encrypted  = @mechanism.encrypted?
+        buf        = @header_buf
+        fbuf       = @frame_buf
+        flag_bytes = Codec::Frame::FLAG_BYTES
+        last       = parts.size - 1
 
         i = 0
 
@@ -361,16 +381,18 @@ module Protocol
             size  = body.bytesize
             flags = more ? Codec::Frame::FLAGS_MORE : 0
 
-            buf.clear
-
             if size > Codec::Frame::SHORT_MAX
+              buf.clear
               [flags | Codec::Frame::FLAGS_LONG, size].pack("CQ>", buffer: buf)
+              @io.write(buf)
+              @io.write(body)
             else
-              [flags, size].pack("CC", buffer: buf)
+              fbuf.clear
+              fbuf << flag_bytes[flags]
+              fbuf << flag_bytes[size]
+              fbuf << body
+              @io.write(fbuf)
             end
-
-            @io.write(buf)
-            @io.write(body)
           end
 
           i += 1

data/lib/protocol/zmtp/mechanism/null.rb

@@ -26,7 +26,7 @@ module Protocol
         # @return [Hash] { peer_socket_type:, peer_identity:, peer_public_key:, peer_properties:, peer_major:, peer_minor: }
         # @raise [Error]
         def handshake!(io, as_server:, socket_type:, identity:, metadata: nil)
-          io.write(Codec::Greeting.encode(mechanism: MECHANISM_NAME, as_server: as_server))
+          io.write(Codec::Greeting.encode(mechanism: MECHANISM_NAME, as_server: false))
           io.flush
 
           peer_greeting = Codec::Greeting.read_from(io)

data/lib/protocol/zmtp/version.rb

@@ -2,6 +2,6 @@
 
 module Protocol
   module ZMTP
-    VERSION = "0.10.0"
+    VERSION = "0.10.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-zmtp
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Patrik Wenger
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: ZMTP 3.1 wire protocol codec and connection
 test_files: []