fast_send 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26069db40cb9f389a16d39c87a6171dd6f341256
-  data.tar.gz: 937f14723306d0d7dcdd58b8a1178a895bcbcbdd
+SHA256:
+  metadata.gz: 6e2c4890b5649cc57d8ada06a7d603dce77e5d98f3fed5f08cc8509f36b2f474
+  data.tar.gz: 55bbe6a60c743baf0b587f9d8b9f11141110f6fe8d497a1bc110620487524edf
 SHA512:
-  metadata.gz: 325587ad50e76b729cc2075b31800d0da68410004bc5826fa936a86ae2fa68da66bfc44511167070bea6a201524d73bd63f7ca84f66e94781ef1a30b21a30cdb
-  data.tar.gz: 25d732c665b5ad6fc96b7a822cdf28225d30e55fec78b0124b61468ec59ccd8f45bef02bc3b6d9c8c7bd6b71e645193019fd98b18d8e12ab66c3f3a91db54d94
+  metadata.gz: 18f09fb016ffbfec08b34b1e249c618500c72099c247f77673ac974ec2f666c7a9da9fdab605a344f42c1f60760cfd2790d5740db1fdd9e2afe2fea2bf587d97
+  data.tar.gz: 52de47120c17aa8c4fa10d9586c6039d04538517cc6da7be069c5082adc5755f162843183494061ec6947a698f684462b33521849d0fe4464a1aea726ea5a910

data/lib/fast_send/socket_handler.rb

@@ -30,8 +30,6 @@ class FastSend::SocketHandler < Struct.new(:stream, :logger, :started_proc, :abo
   SENDFILE_CHUNK_SIZE = 2*1024*1024
 
   def call(socket)
-    return if socket.closed?
-    
     writer_method_name = if socket.respond_to?(:sendfile)
       :sendfile
     elsif RUBY_PLATFORM == 'java'
@@ -39,44 +37,40 @@ class FastSend::SocketHandler < Struct.new(:stream, :logger, :started_proc, :abo
     else
       :copy_stream
     end
-    
-    logger.debug { "Will do file-to-socket using %s" % writer_method_name }
-    
-    begin
-      logger.debug { "Starting the response" }
-      
-      bytes_written = 0
-      
-      started_proc.call(bytes_written)
-      
-      stream.each_file do | file |
-        logger.debug { "Sending %s" % file.inspect }
-        # Run the sending method, depending on the implementation
-        send(writer_method_name, socket, file) do |n_bytes_sent|
-          bytes_written += n_bytes_sent
-          logger.debug { "Written %d bytes" % bytes_written }
-          written_proc.call(n_bytes_sent, bytes_written)
-        end
+
+    logger.debug { "Starting the response, writing via #{writer_method_name}" }
+    bytes_written = 0
+    started_proc.call(bytes_written)
+
+    return if socket.closed? # Only do this now as we need to have bytes_written set
+
+    stream.each_file do | file |
+      logger.debug { "Sending %s" % file.inspect }
+      # Run the sending method, depending on the implementation
+      send(writer_method_name, socket, file) do |n_bytes_sent|
+        bytes_written += n_bytes_sent
+        logger.debug { "Written %d bytes" % bytes_written }
+        written_proc.call(n_bytes_sent, bytes_written)
       end
-      
-      logger.info { "Response written in full - %d bytes" % bytes_written }
-      done_proc.call(bytes_written)
-    rescue *CLIENT_DISCONNECT_EXCEPTIONS => e
-      logger.warn { "Client closed connection: #{e.class}(#{e.message})" }
-      aborted_proc.call(e)
-    rescue Exception => e
-      logger.fatal { "Aborting response due to error: #{e.class}(#{e.message}) and will propagate" }
-      aborted_proc.call(e)
-      error_proc.call(e)
-      raise e unless StandardError === e # Re-raise system errors, signals and other Exceptions
-    ensure
-      # With rack.hijack the consensus seems to be that the hijack
-      # proc is responsible for closing the socket. We also use no-keepalive
-      # so this should not pose any problems.
-      socket.close unless socket.closed?
-      logger.debug { "Performing cleanup" }
-      cleanup_proc.call(bytes_written)
     end
+    
+    logger.info { "Response written in full - %d bytes" % bytes_written }
+    done_proc.call(bytes_written)
+  rescue *CLIENT_DISCONNECT_EXCEPTIONS => e
+    logger.warn { "Client closed connection: #{e.class}(#{e.message})" }
+    aborted_proc.call(e)
+  rescue Exception => e
+    logger.fatal { "Aborting response due to error: #{e.class}(#{e.message}) and will propagate" }
+    aborted_proc.call(e)
+    error_proc.call(e)
+    raise e unless StandardError === e # Re-raise system errors, signals and other Exceptions
+  ensure
+    # With rack.hijack the consensus seems to be that the hijack
+    # proc is responsible for closing the socket. We also use no-keepalive
+    # so this should not pose any problems.
+    socket.close unless socket.closed?
+    logger.debug { "Performing cleanup" }
+    cleanup_proc.call(bytes_written)
   end
 
   # This is majorly useful - if the socket is not selectable after a certain

data/lib/fast_send/version.rb

@@ -1,3 +1,3 @@
 class FastSend
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/fast_send_with_mocks_spec.rb

@@ -239,7 +239,29 @@ describe 'FastSend when used with a mock Socket' do
     
     expect(output.size).to eq(source_size)
   end
-  
+
+  it 'calls the cleanup proc even if the socket enters the handler in a closed state' do
+    source_size = (64 + 54) * 1024 * 1024
+    cleanup_proc = double('Cleanup')
+    app = ->(env) { [200, {'fast_send.cleanup' => cleanup_proc}, EachFileResponse.new] }
+    
+    handler = described_class.new(app)
+    
+    status, headers, body = handler.call({'rack.hijack?' => true, 'rack.logger' => logger})
+    expect(status).to eq(200)
+    expect(body).to eq([])
+    
+    output = Tempfile.new('response_body')
+    
+    already_closed_socket = FakeSocket.new(output)
+    already_closed_socket.close
+
+    hijack = headers.fetch('rack.hijack')
+
+    # The cleanup proc gets called with the number of bytes transferred
+    expect(cleanup_proc).to receive(:call).with(0)
+    hijack.call(already_closed_socket)
+  end
   
   it 'can execute the hijack proc twice without resending the data' do
     source_size = (64 + 54) * 1024 * 1024

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_send
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: and do so bypassing the Ruby VM