protocol-zmtp 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f3ddb84f7c69bf776e615da15797cb815eaf663f357cf16cff60c744153bc8
-  data.tar.gz: fd410e2dc417e623254be530230e88fc3e428f62413d6465ee88465c82444b10
+  metadata.gz: 0f82192f566af0256273b9dd794ad7032c5b1f3d1b2f8a58c37235847715f6fc
+  data.tar.gz: b74e78954d38be3f239d96cbcac676dc564b9ab56dff16f1beff8fbcedb77b8b
 SHA512:
-  metadata.gz: 0c84020c35c81c9b9609541019cb7433956bfed7a2bf8fd4ea615ad7560b9aecec5086efbab733576309ff7cb2febb4f5c98bef2388f55a056bcf38c78a0633d
-  data.tar.gz: 7251f30d057e56f97e6ffa3eb95af5727d7763a04829b3c93580e36998b1aa2591cdc0152ff4d53e7764ea80f75113585513d537147c3de238b498d50f25d15c
+  metadata.gz: 985cc52f11cc1ad7d24bdbec3916ee5485bda72a396413b3735254ae97430117b40ae3fd6331107e953c0b99bc3c05a997c368eeae642e64b023dd3d744381eb
+  data.tar.gz: 100df0f00b447bbc6799c4468b040f15e8fe633bf25d736b44931683772d5f52a50fa2646e8ce3f4768f6076d47482a9a004944f55f42a3d35720ca3f6ede27e

data/lib/protocol/zmtp/connection.rb

@@ -95,9 +95,11 @@ module Protocol
       # @param parts [Array<String>] message frames
       # @return [void]
       def send_message(parts)
-        @mutex.synchronize do
-          write_frames(parts)
-          @io.flush
+        with_deferred_cancel do
+          @mutex.synchronize do
+            write_frames(parts)
+            @io.flush
+          end
         end
       end
 
@@ -108,8 +110,10 @@ module Protocol
       # @param parts [Array<String>] message frames
       # @return [void]
       def write_message(parts)
-        @mutex.synchronize do
-          write_frames(parts)
+        with_deferred_cancel do
+          @mutex.synchronize do
+            write_frames(parts)
+          end
         end
       end
 
@@ -124,12 +128,14 @@ module Protocol
       #   multi-frame message
       # @return [void]
       def write_messages(messages)
-        @mutex.synchronize do
-          i = 0
-          n = messages.size
-          while i < n
-            write_frames(messages[i])
-            i += 1
+        with_deferred_cancel do
+          @mutex.synchronize do
+            i = 0
+            n = messages.size
+            while i < n
+              write_frames(messages[i])
+              i += 1
+            end
           end
         end
       end
@@ -141,8 +147,10 @@ module Protocol
       # @param wire_bytes [String] ZMTP wire-format bytes
       # @return [void]
       def write_wire(wire_bytes)
-        @mutex.synchronize do
-          @io.write(wire_bytes)
+        with_deferred_cancel do
+          @mutex.synchronize do
+            @io.write(wire_bytes)
+          end
         end
       end
 
@@ -191,13 +199,15 @@ module Protocol
       # @param command [Codec::Command]
       # @return [void]
       def send_command(command)
-        @mutex.synchronize do
-          if @mechanism.encrypted?
-            @io.write(@mechanism.encrypt(command.to_body, command: true))
-          else
-            @io.write(command.to_frame.to_wire)
+        with_deferred_cancel do
+          @mutex.synchronize do
+            if @mechanism.encrypted?
+              @io.write(@mechanism.encrypt(command.to_body, command: true))
+            else
+              @io.write(command.to_frame.to_wire)
+            end
+            @io.flush
           end
-          @io.flush
         end
       end
 
@@ -266,6 +276,26 @@ 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.
+      #
+      # When called outside an Async task (test fixtures, blocking
+      # callers), the block runs directly -- there is no task to defer
+      # on. Cancellation arriving from inside the block (peer
+      # disconnect raising +EPIPE+/+EOFError+) propagates normally.
+      def with_deferred_cancel
+        if defined?(Async::Task) && (task = Async::Task.current?)
+          task.defer_cancel { yield }
+        else
+          yield
+        end
+      end
+
+
       # Writes message parts as ZMTP frames, encrypting if needed.
       #
       # For the unencrypted path, writes the frame header and body

data/lib/protocol/zmtp/version.rb

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

metadata

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