async-http 0.50.7 → 0.50.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e2b32bb7262cafc68c516d881d6f3a551597248b06b627ae150111dcfa2b656
-  data.tar.gz: 63f025a564598ec263413f70b9f4a9561a52d1ebbde4d1b2e66c4c9a5a461b89
+  metadata.gz: 6140b4806e8fff4a017e4d2973e2d6ecd28bc248069774d351b13fc5ea907ecf
+  data.tar.gz: 9eef40decca9b155053f7419993d705e280d0ea51e385dc030efebe6d20d4933
 SHA512:
-  metadata.gz: a2d4dad8cdbf23281345f4ab8e5d7d0b58f83f86513940aa108ba292b82defd2ab5bb23b8fd117618ecc0be1a7ecc1d74a81f65582be18362c5bd7d82072f26f
-  data.tar.gz: bef0076a4130b928e1ffd7f42abf15647d639b6ee125de1f71f50d50ae6ede8631f0e11b8c85b455916f3e5417113907de93a9d69e79ac281804d121480c587b
+  metadata.gz: dc926ac38b9d1bf6860ff23282f9c90eb78b965c881fae8130501e0cb4260c757bcf9bb8ee634674b2c3a37b013496ae08a332e54309e0f90979779197505d2c
+  data.tar.gz: b1fb1c1cbbea6b31bdeccaec48972bff12b58f86c8d6b1e5d42f36e389d3c7d5040839d8a74359cc835002e15631bc754a168d8ae643814bfe71e1ea0eadbc7d

data/.travis.yml

@@ -11,6 +11,8 @@ addons:
     packages:
     - wrk
 
+script: bundle exec rspec
+
 matrix:
   include:
     - rvm: 2.4

data/README.md

@@ -160,9 +160,9 @@ Here is a basic example of a client/server running in the same reactor:
 ```ruby
 #!/usr/bin/env ruby
 
+require 'async'
 require 'async/http/server'
 require 'async/http/client'
-require 'async/reactor'
 require 'async/http/endpoint'
 require 'async/http/protocol/response'
 
@@ -175,7 +175,7 @@ end
 server = Async::HTTP::Server.new(app, endpoint)
 client = Async::HTTP::Client.new(endpoint)
 	
-Async::Reactor.run do |task|
+Async do |task|
 	server_task = task.async do
 		server.run
 	end

data/async-http.gemspec

@@ -27,6 +27,8 @@ Gem::Specification.new do |spec|
 	
 	# spec.add_dependency("openssl")
 	
+	spec.add_development_dependency "bake-bundler"
+	
 	spec.add_development_dependency "async-rspec", "~> 1.10"
 	spec.add_development_dependency "async-container", "~> 0.14.0"
 	
@@ -36,5 +38,4 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
-	spec.add_development_dependency "rake"
 end

data/bake/async/http.rb

@@ -21,7 +21,7 @@ def fetch(url, method:)
 	format_body = proc do |body, terminal|
 		if body
 			if length = body.length
-				terminal.print(:body, "body with length", :length, length, "B")
+				terminal.print(:body, "body with length ", :length, length, "B")
 			else
 				terminal.print(:body, "body without length")
 			end

data/examples/download/chunked.rb

@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+
+require 'async'
+require 'async/clock'
+require 'async/barrier'
+require_relative '../../lib/async/http/endpoint'
+require_relative '../../lib/async/http/client'
+
+Async do
+	url = "https://static.openfoodfacts.org/data/en.openfoodfacts.org.products.csv"
+	
+	endpoint = Async::HTTP::Endpoint.parse(url)
+	client = Async::HTTP::Client.new(endpoint)
+	
+	headers = {'user-agent' => 'curl/7.69.1', 'accept' => '*/*'}
+	
+	file = File.open("products.csv", "w")
+	Async.logger.info(self) {"Saving download to #{Dir.pwd}"}
+	
+	begin
+		response = client.head(endpoint.path, headers)
+		content_length = nil
+		
+		if response.success?
+			unless response.headers['accept-ranges'].include?('bytes')
+				raise "Does not advertise support for accept-ranges: bytes!"
+			end
+			
+			unless content_length = response.body&.length
+				raise "Could not determine length of response!"
+			end
+		end
+	ensure
+		response&.close
+	end
+	
+	Async.logger.info(self) {"Content length: #{content_length/(1024**2)}MiB"}
+	
+	parts = []
+	offset = 0
+	chunk_size = 1024*1024
+	
+	start_time = Async::Clock.now
+	amount = 0
+	
+	while offset < content_length
+		byte_range_start = offset
+		byte_range_end = [offset + chunk_size, content_length].min
+		parts << (byte_range_start...byte_range_end)
+		
+		offset += chunk_size
+	end
+	
+	Async.logger.info(self) {"Breaking download into #{parts.size} parts..."}
+	
+	barrier = Async::Barrier.new
+	
+	while !parts.empty?
+		barrier.async do
+			part = parts.shift
+			
+			Async.logger.info(self) {"Issuing range request range: bytes=#{part.min}-#{part.max}"}
+			
+			response = client.get(endpoint.path, [
+				["range", "bytes=#{part.min}-#{part.max-1}"],
+				*headers
+			])
+			
+			if response.success?
+				Async.logger.info(self) {"Got response: #{response}... writing data for #{part}."}
+				written = file.pwrite(response.read, part.min)
+				
+				amount += written
+				
+				duration = Async::Clock.now - start_time
+				Async.logger.info(self) {"Rate: #{((amount.to_f/(1024**2))/duration).round(2)}MiB/s"}
+			end
+		end
+	end
+	
+	barrier.wait
+ensure
+	client&.close
+end

data/examples/stream/stop.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+require 'async'
+require 'async/http/internet'
+
+Async do |parent|
+	internet = Async::HTTP::Internet.new
+	connection = nil
+	
+	child = parent.async do
+		response = internet.get("https://utopia-falcon-heroku.herokuapp.com/beer/index")
+		connection = response.connection
+		
+		response.each do |chunk|
+			Async.logger.info(response) {chunk}
+		end
+	ensure
+		Async.logger.info(response) {"Closing response..."}
+		response&.close
+	end
+	
+	parent.sleep(5)
+	
+	Async.logger.info(parent) {"Killing #{child}..."}
+	child.stop
+ensure
+	internet&.close
+end

data/lib/async/http/client.rb

@@ -103,36 +103,53 @@ module Async
 					# As we cache pool, it's possible these pool go bad (e.g. closed by remote host). In this case, we need to try again. It's up to the caller to impose a timeout on this. If this is the last attempt, we force a new connection.
 					connection = @pool.acquire
 					
-					response = request.call(connection)
+					response = make_response(request, connection)
 					
-					# The connection won't be released until the body is completely read/released.
-					::Protocol::HTTP::Body::Streamable.wrap(response) do
-						@pool.release(connection)
-					end
+					# This signals that the ensure block below should not try to release the connection, because it's bound into the response which will be returned:
+					connection = nil
 					
 					return response
 				rescue Protocol::RequestFailed
 					# This is a specific case where the entire request wasn't sent before a failure occurred. So, we can even resend non-idempotent requests.
-					@pool.release(connection) if connection
+					if connection
+						@pool.release(connection)
+						connection = nil
+					end
 					
 					if attempt < @retries
 						retry
 					else
 						raise
 					end
-				rescue
-					@pool.release(connection) if connection
+				rescue Errno::ECONNRESET, Errno::EPIPE, IOError
+					if connection
+						@pool.release(connection)
+						connection = nil
+					end
 					
 					if request.idempotent? and attempt < @retries
 						retry
 					else
 						raise
 					end
+				ensure
+					@pool.release(connection) if connection
 				end
 			end
 			
 			protected
 			
+			def make_response(request, connection)
+				response = request.call(connection)
+				
+				# The connection won't be released until the body is completely read/released.
+				::Protocol::HTTP::Body::Streamable.wrap(response) do
+					@pool.release(connection)
+				end
+				
+				return response
+			end
+			
 			def make_pool(connection_limit)
 				Async::Pool::Controller.wrap(limit: connection_limit) do
 					Async.logger.debug(self) {"Making connection to #{@endpoint.inspect}"}

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.50.7"
+		VERSION = "0.50.8"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.50.7
+  version: 0.50.8
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: bake-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - samuel.williams@oriontransfer.co.nz
@@ -219,13 +219,13 @@ files:
 - ".travis.yml"
 - Gemfile
 - README.md
-- Rakefile
 - async-http.gemspec
 - bake.rb
 - bake/async/http.rb
 - bake/async/http/h2spec.rb
 - examples/compare/Gemfile
 - examples/compare/benchmark.rb
+- examples/download/chunked.rb
 - examples/fetch/Gemfile
 - examples/fetch/Gemfile.lock
 - examples/fetch/README.md
@@ -234,6 +234,7 @@ files:
 - examples/fetch/public/stream.js
 - examples/google/search.rb
 - examples/request.rb
+- examples/stream/stop.rb
 - examples/trenni/Gemfile
 - examples/trenni/streaming.rb
 - examples/upload/client.rb

data/Rakefile

@@ -1,9 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new
-
-task :default => :spec
-
-# Load all rake tasks:
-import(*Dir.glob('tasks/**/*.rake'))