datastar 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e8680c34cae9941df0cdd31d0bcb04e44d3d402b4ac552b56ab0cb62d510628
-  data.tar.gz: 5b2bb1404549cfeaab4e9ad2dff1a53b67ac6bd4adc86f1cb52c3b7591229b7e
+  metadata.gz: 6fc6011ed2e49835f82ef6345c457f7e50812d155802ca722a9abb7858bffcc6
+  data.tar.gz: 6849ec8942f01e3d252e2bfdc77902bb4901663a2baa153fd72e421b64336915
 SHA512:
-  metadata.gz: 919a990d068032292269cbdb3eed058e78f72680786fb9db8ba250da387007e31c33918d96f50201fcf7b75169f2e8ab84bb880daa66e56702289371d0854d68
-  data.tar.gz: 878e3330cd5ddf62e89322c7e1564c20fc9855edf49b4018556947bc1efc91d93594cd67396f56f5c945f2b143214dd7ade43c69cd1bb5665ae50f58b2e22698
+  metadata.gz: 895e948c8ea3cb095768c409fc6fcb9cec2d31c20fa41c47ac0131af35729aeb8ee0138d880cd70e9ec06d893101791e8a1d5db73355496f69bbe0242e9a03f1
+  data.tar.gz: f7f10819510f6b69757b2982cf71bbe31a8504688e5efd575cc077a97e183e17f16b5d10a830bcb8966eec4076cfac2bcb2faddc74b355288cb6ec8d21dd97d4

data/lib/datastar/dispatcher.rb

@@ -386,14 +386,33 @@ module Datastar
       @compressor.wrap_socket(socket)
     end
 
+    # Errors raised when writing to a socket the client has closed.
+    DISCONNECT_ERRORS = [IOError, Errno::EPIPE, Errno::ECONNRESET].freeze
+
+    # Whether an error means the client went away.
+    #
+    # Servers may wrap the underlying socket error in their own class
+    # (e.g. protocol-http1 >= 0.41 raises +Protocol::HTTP::RemoteError+
+    # from a +rescue Errno::EPIPE+), so the +cause+ chain is checked too.
+    #
+    # @param error [Exception]
+    # @return [Boolean]
+    def client_disconnect?(error)
+      while error
+        return true if DISCONNECT_ERRORS.any? { |klass| error.is_a?(klass) }
+
+        error = error.cause
+      end
+      false
+    end
+
     # Handle errors caught during streaming
     # @param error [Exception] the error that occurred
     # @param socket [IO] the socket to pass to error handlers
     def handle_streaming_error(error, socket)
-      case error
-      when IOError, Errno::EPIPE, Errno::ECONNRESET
+      if client_disconnect?(error)
         @on_client_disconnect.each { |callable| callable.call(socket) }
-      when Exception
+      else
         @on_error.each { |callable| callable.call(error) }
       end
     end
@@ -407,10 +426,8 @@ module Datastar
       yield
 
       @on_server_disconnect.each { |callable| callable.call(generator) }
-    rescue IOError, Errno::EPIPE, Errno::ECONNRESET => e
-      @on_client_disconnect.each { |callable| callable.call(socket) }
     rescue Exception => e
-      @on_error.each { |callable| callable.call(e) }
+      handle_streaming_error(e, socket)
     end
 
     # Parse signals from the request

data/lib/datastar/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Datastar
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datastar
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ismael Celis