protocol-zmtp 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f82192f566af0256273b9dd794ad7032c5b1f3d1b2f8a58c37235847715f6fc
-  data.tar.gz: b74e78954d38be3f239d96cbcac676dc564b9ab56dff16f1beff8fbcedb77b8b
+  metadata.gz: fe0884f347da68db2bbd04949c944108a997d67f545e511e5a74973a84c1d359
+  data.tar.gz: ff1542dd2feffb84db290fc1dacb8e06d10da80282619c342a59d8d239388125
 SHA512:
-  metadata.gz: 985cc52f11cc1ad7d24bdbec3916ee5485bda72a396413b3735254ae97430117b40ae3fd6331107e953c0b99bc3c05a997c368eeae642e64b023dd3d744381eb
-  data.tar.gz: 100df0f00b447bbc6799c4468b040f15e8fe633bf25d736b44931683772d5f52a50fa2646e8ce3f4768f6076d47482a9a004944f55f42a3d35720ca3f6ede27e
+  metadata.gz: 41b15de98c2e4f0ed6db44f9cf9d9524e4dac42c1f01bf75652a363c9afbedc1af755b7531e113e32abea1a3fd64f164446190c81e036a172989868b5bd712a0
+  data.tar.gz: 7325e3b59a72b14776128de68361f0507ebfca31d52646aadd1688b6b022e8b04fa9308c3b8a2da7ddccccaaa1d5ed81d58f9f8a0f15a308fd0e196f8b45ceb9

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

@@ -20,14 +20,16 @@ module Protocol
         # @return [String] command name (e.g. "READY", "SUBSCRIBE")
         attr_reader :name
 
+
         # @return [String] command data (binary)
         attr_reader :data
 
+
         # @param name [String] command name
         # @param data [String] command data
-        def initialize(name, data = "".b)
+        def initialize(name, data = EMPTY_BINARY)
           @name = name
-          @data = data.b
+          @data = data.encoding == Encoding::BINARY ? data : data.b
         end
 
 
@@ -35,8 +37,9 @@ module Protocol
         #
         # @return [String] binary body (name-length + name + data)
         def to_body
-          name_bytes = @name.b
-          name_bytes.bytesize.chr.b + name_bytes + @data
+          name_bytes = @name.encoding == Encoding::BINARY ? @name : @name.b
+          buf = String.new(capacity: 1 + name_bytes.bytesize + @data.bytesize, encoding: Encoding::BINARY)
+          buf << Frame::FLAG_BYTES[name_bytes.bytesize] << name_bytes << @data
         end
 
 

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

@@ -3,6 +3,11 @@
 module Protocol
   module ZMTP
     module Codec
+
+      # Frozen empty binary string for zero-length frame bodies.
+      EMPTY_BINARY = "".b.freeze
+
+
       # ZMTP frame encode/decode.
       #
       # Wire format:
@@ -19,6 +24,9 @@ module Protocol
         # Short frame: 1-byte size, max body 255 bytes.
         SHORT_MAX = 255
 
+        # Pre-computed single-byte flag strings (avoids Integer#chr + String#b per frame).
+        FLAG_BYTES = Array.new(256) { |i| i.chr.b.freeze }.freeze
+
 
         # @return [String] frame body (binary)
         attr_reader :body
@@ -49,9 +57,9 @@ module Protocol
           flags |= FLAGS_COMMAND if @command
 
           if size > SHORT_MAX
-            (flags | FLAGS_LONG).chr.b + [size].pack("Q>") + @body
+            FLAG_BYTES[flags | FLAGS_LONG] + [size].pack("Q>") + @body
           else
-            flags.chr.b + size.chr.b + @body
+            FLAG_BYTES[flags] + FLAG_BYTES[size] + @body
           end
         end
 
@@ -64,9 +72,20 @@ module Protocol
         # @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
+          buf  = String.new(encoding: Encoding::BINARY)
+          last = parts.size - 1
+          i    = 0
+          while i < parts.size
+            body  = parts[i]
+            body  = body.b unless body.encoding == Encoding::BINARY
+            size  = body.bytesize
+            flags = i < last ? FLAGS_MORE : 0
+            if size > SHORT_MAX
+              buf << FLAG_BYTES[flags | FLAGS_LONG] << [size].pack("Q>") << body
+            else
+              buf << FLAG_BYTES[flags] << FLAG_BYTES[size] << body
+            end
+            i += 1
           end
           buf.freeze
         end
@@ -95,7 +114,7 @@ module Protocol
             raise Error, "frame size #{size} exceeds max_message_size #{max_message_size}"
           end
 
-          body = size > 0 ? io.read_exactly(size) : "".b
+          body = size > 0 ? io.read_exactly(size) : EMPTY_BINARY
 
           new(body, more: more, command: command)
         end

data/lib/protocol/zmtp/connection.rb

@@ -306,13 +306,17 @@ module Protocol
       def write_frames(parts)
         encrypted = @mechanism.encrypted?
         buf       = @header_buf
+        last      = parts.size - 1
 
-        parts.each_with_index do |part, i|
-          more = i < parts.size - 1
+        i = 0
+        while i < parts.size
+          part = parts[i]
+          more = i < last
           if encrypted
-            @io.write(@mechanism.encrypt(part.b, more: more))
+            body = part.encoding == Encoding::BINARY ? part : part.b
+            @io.write(@mechanism.encrypt(body, more: more))
           else
-            body  = part.b
+            body  = part.encoding == Encoding::BINARY ? part : part.b
             size  = body.bytesize
             flags = more ? Codec::Frame::FLAGS_MORE : 0
             buf.clear
@@ -324,6 +328,7 @@ module Protocol
             @io.write(buf)
             @io.write(body)
           end
+          i += 1
         end
       end
     end

data/lib/protocol/zmtp/version.rb

@@ -2,6 +2,6 @@
 
 module Protocol
   module ZMTP
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

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