protocol-zmtp 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5372fe6734b5faeded3069e3b510a7ff648458508c82e3a6c2b9d353ebd57179
-  data.tar.gz: b6e5cb324afac1deece4df0a0c8cc3aadbfa2ca3a31d29b38ece87dcea777c82
+  metadata.gz: 81270e34092271f0e0aaceed0ce882885751def59b75716872d074952e4d6b41
+  data.tar.gz: ccbf823376d70d8654384b99c1bb30b270dc9493cd432c524a3caab175eaa364
 SHA512:
-  metadata.gz: 21ec084b6bf898ed867c9c80700a3d9fad53146798d906a1cadeaed25f28745fa56d47f350e35e6af55e9ba5f7c8c7919342d2bba8e21d6068f585fb54105cc8
-  data.tar.gz: 90812f6950f8f558a9f33a7f57c2142c63b7c21bab6d4a5d2e788bdb5c9b26154a41b50dde097852e7bfab46e901d706c34d81b6acca0bfa5fd920bfcc655fe7
+  metadata.gz: f148b0ac01768320f35f2edf7ac67f3d51ad3e5daa4a9c9dafccb57168e8e9f616f6f27425c00b82edcd7e0af898188ae37ea3a78f404a786bdd9a94c01cb675
+  data.tar.gz: bdab4d4b763394ea1f11aec4503a74d68f499671c93851adc96c2e34bcd7134de837b71941119a1aa029a0966c4ed4cfea8def3f5140244e50f9c2a9b3b0355d

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

@@ -130,9 +130,9 @@ module Protocol
         # @param ttl [Numeric] time-to-live in seconds (sent as deciseconds)
         # @param context [String] optional context bytes (up to 16 bytes)
         # @return [Command]
-        def self.ping(ttl: 0, context: "".b)
+        def self.ping(ttl: 0, context: EMPTY_BINARY)
           ttl_ds = (ttl * 10).to_i
-          new("PING", [ttl_ds].pack("n") + context.b)
+          new("PING", [ttl_ds].pack("n") + (context.encoding == Encoding::BINARY ? context : context.b))
         end
 
 
@@ -140,8 +140,8 @@ module Protocol
         #
         # @param context [String] context bytes echoed from the PING
         # @return [Command]
-        def self.pong(context: "".b)
-          new("PONG", context.b)
+        def self.pong(context: EMPTY_BINARY)
+          new("PONG", context.encoding == Encoding::BINARY ? context : context.b)
         end
 
 
@@ -150,7 +150,7 @@ module Protocol
         # @return [Array(Numeric, String)] [ttl_seconds, context_bytes]
         def ping_ttl_and_context
           ttl_ds  = @data.unpack1("n")
-          context = @data.bytesize > 2 ? @data.byteslice(2..) : "".b
+          context = @data.bytesize > 2 ? @data.byteslice(2..) : EMPTY_BINARY
           [ttl_ds / 10.0, context]
         end
 

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

@@ -31,21 +31,28 @@ module Protocol
         # @return [String] frame body (binary)
         attr_reader :body
 
+
         # @param body [String] frame body
         # @param more [Boolean] more frames follow
         # @param command [Boolean] this is a command frame
         def initialize(body, more: false, command: false)
-          @body    = body.b
+          @body    = body.encoding == Encoding::BINARY ? body : body.b
           @more    = more
           @command = command
         end
 
 
         # @return [Boolean] true if more frames follow in this message
-        def more?    = @more
+        def more?
+          @more
+        end
+
 
         # @return [Boolean] true if this is a command frame
-        def command? = @command
+        def command?
+          @command
+        end
+
 
         # Encodes to wire bytes.
         #
@@ -57,9 +64,11 @@ module Protocol
           flags |= FLAGS_COMMAND if @command
 
           if size > SHORT_MAX
-            FLAG_BYTES[flags | FLAGS_LONG] + [size].pack("Q>") + @body
+            buf = String.new(capacity: 9 + size, encoding: Encoding::BINARY)
+            buf << FLAG_BYTES[flags | FLAGS_LONG] << [size].pack("Q>") << @body
           else
-            FLAG_BYTES[flags] + FLAG_BYTES[size] + @body
+            buf = String.new(capacity: 2 + size, encoding: Encoding::BINARY)
+            buf << FLAG_BYTES[flags] << FLAG_BYTES[size] << @body
           end
         end
 
@@ -72,14 +81,29 @@ module Protocol
         # @return [String] frozen binary wire representation
         #
         def self.encode_message(parts)
-          buf  = String.new(encoding: Encoding::BINARY)
+          if parts.size == 1
+            s = parts[0].bytesize
+            wire_size = s > SHORT_MAX ? 9 + s : 2 + s
+          else
+            wire_size = 0
+            j = 0
+            while j < parts.size
+              s = parts[j].bytesize
+              wire_size += s > SHORT_MAX ? 9 + s : 2 + s
+              j += 1
+            end
+          end
+
+          buf  = String.new(capacity: wire_size, 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
@@ -87,6 +111,7 @@ module Protocol
             end
             i += 1
           end
+
           buf.freeze
         end
 
@@ -137,6 +162,7 @@ module Protocol
             (rest.getbyte(4) << 16) | (rest.getbyte(5) << 8)  |
              rest.getbyte(6)
         end
+
       end
     end
   end

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

@@ -34,7 +34,7 @@ module Protocol
         # @return [String] binary frame body
         def body(prefix, cancel: false)
           flag = cancel ? FLAG_CANCEL : FLAG_SUBSCRIBE
-          (flag + prefix.b).b
+          flag + (prefix.encoding == Encoding::BINARY ? prefix : prefix.b)
         end
 
 

data/lib/protocol/zmtp/connection.rb

@@ -15,32 +15,41 @@ module Protocol
       # @return [String] peer's socket type (from READY handshake)
       attr_reader :peer_socket_type
 
+
       # @return [String] peer's identity (from READY handshake)
       attr_reader :peer_identity
 
+
       # @return [Integer] peer's QoS level (from READY handshake, 0 if absent)
       attr_reader :peer_qos
 
+
       # @return [String] peer's supported hash algorithms in preference order
       attr_reader :peer_qos_hash
 
+
       # @return [Hash{String => String}, nil] full peer READY property hash
       #   (set after a successful handshake; nil before)
       attr_reader :peer_properties
 
+
       # @return [Integer, nil] peer ZMTP major version (from greeting)
       attr_reader :peer_major
 
+
       # @return [Integer, nil] peer ZMTP minor version (from greeting);
       #   0 for ZMTP 3.0 peers, 1 for ZMTP 3.1+
       attr_reader :peer_minor
 
+
       # @return [Object] transport IO (#read_exactly, #write, #flush, #close)
       attr_reader :io
 
+
       # @return [Float, nil] monotonic timestamp of last received frame
       attr_reader :last_received_at
 
+
       # @param io [#read_exactly, #write, #flush, #close] transport IO
       # @param socket_type [String] our socket type name (e.g. "REQ")
       # @param identity [String] our identity
@@ -79,14 +88,12 @@ module Protocol
       # @return [void]
       # @raise [Error] on handshake failure
       def handshake!
-        result = @mechanism.handshake!(
-          @io,
+        result = @mechanism.handshake! @io,
           as_server:   @as_server,
           socket_type: @socket_type,
           identity:    @identity,
           qos:         @qos,
-          qos_hash:    @qos_hash,
-        )
+          qos_hash:    @qos_hash
 
         @peer_socket_type = result[:peer_socket_type]
         @peer_identity    = result[:peer_identity]
@@ -198,15 +205,19 @@ module Protocol
       # @raise [EOFError] if connection is closed
       def receive_message
         frames = []
+
         loop do
           frame = read_frame
+
           if frame.command?
             yield frame if block_given?
             next
           end
+
           frames << frame.body.freeze
           break unless frame.more?
         end
+
         frames.freeze
       end
 
@@ -244,6 +255,7 @@ module Protocol
             close
             raise
           end
+
           touch_heartbeat
 
           frame = @mechanism.decrypt(frame) if @mechanism.encrypted?
@@ -259,6 +271,7 @@ module Protocol
               next
             end
           end
+
           return frame
         end
       end
@@ -326,9 +339,11 @@ module Protocol
         last      = parts.size - 1
 
         i = 0
+
         while i < parts.size
           part = parts[i]
           more = i < last
+
           if encrypted
             body = part.encoding == Encoding::BINARY ? part : part.b
             @io.write(@mechanism.encrypt(body, more: more))
@@ -336,18 +351,23 @@ module Protocol
             body  = part.encoding == Encoding::BINARY ? part : part.b
             size  = body.bytesize
             flags = more ? Codec::Frame::FLAGS_MORE : 0
+
             buf.clear
+
             if size > Codec::Frame::SHORT_MAX
               [flags | Codec::Frame::FLAGS_LONG, size].pack("CQ>", buffer: buf)
             else
               [flags, size].pack("CC", buffer: buf)
             end
+
             @io.write(buf)
             @io.write(body)
           end
+
           i += 1
         end
       end
+
     end
   end
 end

data/lib/protocol/zmtp/version.rb

@@ -2,6 +2,6 @@
 
 module Protocol
   module ZMTP
-    VERSION = "0.8.0"
+    VERSION = "0.8.1"
   end
 end

metadata

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