async-http 0.48.2 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0899a35a93ac5e933f7187c1882ff12882a71bd0f9cc9de70822968a3cbbe524'
-  data.tar.gz: 708d8334a3963fa28b6b628394a7429bd5bfd76df93ac7def6fe9a0d70b89933
+  metadata.gz: 6e9889b252683ee3e3a2fdb7e41c776615d88105425d03880dd76ba3a7fa7b4f
+  data.tar.gz: ff700f16b6f5caa0ebf3d7d48f01ce89d903d5670cf189b6856f25b7238e91ea
 SHA512:
-  metadata.gz: d0633dfbaadea54ea15d24b9d6646c21a7b57405eefae1491d5cb176a857df50076dff59c64a7f3d41eee8c9fb8e005f5d860bae807247b3caf2876beddce033
-  data.tar.gz: a4251adb92b19fd2196f193d6c5f39d158610e9e782c5fcdcc6057b6c892c9036309447905729c46b755ced9dd64ab2379d836727e43707ce45f24eb2f3b1fe9
+  metadata.gz: fefc876e105b822b446527c42cfd909ea9123dc194bd142bf8f4ee7eae92ac71a4ca444532b97ab96de996552ac757dc10403eb4bb8bcfdb286273b092c14b4e
+  data.tar.gz: 1a64d6556647c666b29d91b012a6826c6cc973683c512437a7255c58d74a03a4c083f22cffa3f4a20e4873bad4f45662437135be3945a1500869d5683b4b094c

data/Gemfile

@@ -1,8 +1,10 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in async-io.gemspec
 gemspec
 
+# gem "async", path: "../async"
+# gem "async-io", path: "../async-io"
+
 # gem "protocol-http", path: "../protocol-http"
 # gem "protocol-http1", path: "../protocol-http1"
 # gem "protocol-http2", path: "../protocol-http2"
@@ -10,4 +12,5 @@ gemspec
 
 group :development do
 	gem 'pry'
+	gem 'ruby-prof', '~> 0.18'
 end

data/README.md

@@ -41,7 +41,7 @@ require 'async/http/internet'
 
 data = {'life' => 42}
 
-Async.run do
+Async do
 	# Make a new internet:
 	internet = Async::HTTP::Internet.new
 	
@@ -72,7 +72,7 @@ Here is an example showing how to download a file and save it to a local path:
 require 'async'
 require 'async/http/internet'
 
-Async.run do
+Async do
 	# Make a new internet:
 	internet = Async::HTTP::Internet.new
 	
@@ -98,7 +98,7 @@ require 'async/http/server'
 require 'async/http/client'
 require 'async/reactor'
 require 'async/http/endpoint'
-require 'async/http/response'
+require 'async/http/protocol/response'
 
 endpoint = Async::HTTP::Endpoint.parse('http://127.0.0.1:9294')
 

data/async-http.gemspec

@@ -16,17 +16,17 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f)}
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency("async", "~> 1.19")
-	spec.add_dependency("async-io", "~> 1.25")
+	spec.add_dependency("async", "~> 1.23")
+	spec.add_dependency("async-io", "~> 1.27.0")
 	
-	spec.add_dependency("protocol-http", "~> 0.12.0")
-	spec.add_dependency("protocol-http1", "~> 0.9.0")
-	spec.add_dependency("protocol-http2", "~> 0.9.0")
+	spec.add_dependency("protocol-http", "~> 0.13.0")
+	spec.add_dependency("protocol-http1", "~> 0.10.0")
+	spec.add_dependency("protocol-http2", "~> 0.10.0")
 	
 	# spec.add_dependency("openssl")
 	
 	spec.add_development_dependency "async-rspec", "~> 1.10"
-	spec.add_development_dependency "async-container", "~> 0.14"
+	spec.add_development_dependency "async-container", "~> 0.14.0"
 	
 	spec.add_development_dependency "rack-test"
 	

data/examples/google/search.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require "async"
+require "async/clock"
+require "protocol/http/middleware"
+require_relative "../../lib/async/http"
+
+URL = "https://www.google.com/search"
+ENDPOINT = Async::HTTP::Endpoint.parse(URL)
+
+class Google < Protocol::HTTP::Middleware
+	def search(term)
+		Async.logger.info(self) {"Searching for #{term}..."}
+		
+		self.get("/search?q=#{term}", {"user-agent" => "Hi Google!"})
+	end
+end
+
+terms = %w{thoughtful fear size payment lethal modern recognise face morning sulky mountainous contain science snow uncle skirt truthful door travel snails closed rotten halting creator teeny-tiny beautiful cherries unruly level follow strip team things suggest pretty warm end cannon bad pig consider airport strengthen youthful fog three walk furry pickle moaning fax book ruddy sigh plate cakes shame stem faulty bushes dislike train sleet one colour behavior bitter suit count loutish squeak learn watery orange idiotic seat wholesale omniscient nostalgic arithmetic instruct committee puffy program cream cake whistle rely encourage war flagrant amusing fluffy prick utter wacky occur daily son check}
+
+if count = ENV['COUNT']&.to_i
+	terms = terms.first(count)
+end
+
+Async do |task|
+	client = Async::HTTP::Client.new(ENDPOINT)
+	google = Google.new(client)
+	
+	google.search("null").finish
+	
+	duration = Async::Clock.measure do
+		counts = terms.map do |term|
+			task.async do
+				response = google.search(term)
+				[term, response.read.scan(term).count]
+			end
+		end.map(&:wait).to_h
+		
+		pp counts
+	end
+	
+	pp duration
+ensure
+	google.close
+end

data/examples/request.rb

@@ -10,7 +10,7 @@ require 'async/http/endpoint'
 
 # Async.logger.level = Logger::DEBUG
 
-Async.run do |task|
+Async do |task|
 	endpoint = Async::HTTP::Endpoint.parse("https://www.google.com")
 	
 	client = Async::HTTP::Client.new(endpoint)

data/examples/upload/client.rb

@@ -8,7 +8,7 @@ require 'async/http/body/delayed'
 require 'async/http/client'
 require 'async/http/endpoint'
 
-Async.run do
+Async do
 	endpoint = Async::HTTP::Endpoint.parse("http://localhost:9222")
 	client = Async::HTTP::Client.new(endpoint, Async::HTTP::Protocol::HTTP2)
 	

data/examples/upload/server.rb

@@ -10,7 +10,7 @@ endpoint = Async::HTTP::Endpoint.parse('http://127.0.0.1:9222', reuse_port: true
 
 Async.logger.level = Logger::DEBUG
 
-Async.run do
+Async do
 	server = Async::HTTP::Server.for(endpoint, protocol) do |request|
 		Protocol::HTTP::Response[200, {}, request.body]
 	end

data/examples/upload/upload.rb

@@ -4,7 +4,7 @@ require 'async'
 require 'async/http/body/file'
 require 'async/http/internet'
 
-Async.run do
+Async do
 	internet = Async::HTTP::Internet.new
 	
 	headers = [

data/lib/async/http/client.rb

@@ -126,11 +126,11 @@ module Async
 			
 			protected
 			
-			def make_pool(connection_limit = nil)
+			def make_pool(connection_limit)
 				Pool.new(connection_limit) do
 					Async.logger.debug(self) {"Making connection to #{@endpoint.inspect}"}
 					
-					@protocol.client(IO::Stream.new(@endpoint.connect))
+					@protocol.client(@endpoint.connect)
 				end
 			end
 		end

data/lib/async/http/endpoint.rb

@@ -161,21 +161,8 @@ module Async
 				end
 			end
 			
-			def tcp_options
-				options = @options.dup
-				
-				options.delete(:scheme)
-				options.delete(:port)
-				options.delete(:hostname)
-				options.delete(:ssl_context)
-				options.delete(:alpn_protocols)
-				options.delete(:protocol)
-				
-				return options
-			end
-			
 			def build_endpoint(endpoint = nil)
-				endpoint ||= Async::IO::Endpoint.tcp(self.hostname, port, tcp_options)
+				endpoint ||= tcp_endpoint
 				
 				if secure?
 					# Wrap it in SSL:
@@ -204,8 +191,8 @@ module Async
 			def each
 				return to_enum unless block_given?
 				
-				self.endpoint.each do |endpoint|
-					yield self.class.new(@url, endpoint, @options)
+				self.tcp_endpoint.each do |endpoint|
+					yield self.class.new(@url, endpoint, **@options)
 				end
 			end
 			
@@ -220,6 +207,25 @@ module Async
 			def hash
 				self.key.hash
 			end
+			
+			protected
+			
+			def tcp_options
+				options = @options.dup
+				
+				options.delete(:scheme)
+				options.delete(:port)
+				options.delete(:hostname)
+				options.delete(:ssl_context)
+				options.delete(:alpn_protocols)
+				options.delete(:protocol)
+				
+				return options
+			end
+			
+			def tcp_endpoint
+				Async::IO::Endpoint.tcp(self.hostname, port, **tcp_options)
+			end
 		end
 	end
 end

data/lib/async/http/pool.rb

@@ -45,6 +45,7 @@ module Async
 				@limit = limit
 				
 				@constructor = block
+				@guard = Async::Semaphore.new(1)
 			end
 			
 			# The number of allocated resources.
@@ -54,7 +55,7 @@ module Async
 			
 			# Whether there are resources which are currently in use.
 			def busy?
-				@resources.collect do |_,usage|
+				@resources.collect do |_, usage|
 					return true if usage > 0
 				end
 				
@@ -138,6 +139,10 @@ module Async
 				
 				Async.logger.debug(self) {"Wait for resource #{resource}"}
 				
+				if resource.multiplex
+					@available.signal
+				end
+				
 				return resource
 			end
 			
@@ -165,10 +170,12 @@ module Async
 					end
 				end
 				
-				if !@limit or self.active < @limit
-					Async.logger.debug(self) {"No resources resources, allocating new one..."}
-					
-					return create
+				@guard.acquire do
+					if @limit.nil? or self.active < @limit
+						Async.logger.debug(self) {"No resources resources, allocating new one..."}
+						
+						return create
+					end
 				end
 				
 				return nil

data/lib/async/http/protocol/http1.rb

@@ -31,12 +31,16 @@ module Async
 					true
 				end
 				
-				def self.client(stream)
-					HTTP1::Client.new(stream, VERSION)
+				def self.client(peer)
+					stream = IO::Stream.new(peer, sync: false)
+					
+					return HTTP1::Client.new(stream, VERSION)
 				end
 				
-				def self.server(stream)
-					HTTP1::Server.new(stream, VERSION)
+				def self.server(peer)
+					stream = IO::Stream.new(peer, sync: false)
+					
+					return HTTP1::Server.new(stream, VERSION)
 				end
 				
 				def self.names

data/lib/async/http/protocol/http1/connection.rb

@@ -70,8 +70,7 @@ module Async
 					end
 					
 					def reusable?
-						@stream && !@stream.closed?
-						# !(self.closed? || @stream.closed?)
+						@persistent && @stream && !@stream.closed?
 					end
 					
 					def close

data/lib/async/http/protocol/http10.rb

@@ -30,12 +30,16 @@ module Async
 					false
 				end
 				
-				def self.client(stream)
-					HTTP1::Client.new(stream, VERSION)
+				def self.client(peer)
+					stream = IO::Stream.new(peer, sync: false)
+					
+					return HTTP1::Client.new(stream, VERSION)
 				end
 				
-				def self.server(stream)
-					HTTP1::Server.new(stream, VERSION)
+				def self.server(peer)
+					stream = IO::Stream.new(peer, sync: false)
+					
+					return HTTP1::Server.new(stream, VERSION)
 				end
 				
 				def self.names

data/lib/async/http/protocol/http11.rb

@@ -30,12 +30,16 @@ module Async
 					true
 				end
 				
-				def self.client(stream)
-					HTTP1::Client.new(stream, VERSION)
+				def self.client(peer)
+					stream = IO::Stream.new(peer, sync: false)
+					
+					return HTTP1::Client.new(stream, VERSION)
 				end
 				
-				def self.server(stream)
-					HTTP1::Server.new(stream, VERSION)
+				def self.server(peer)
+					stream = IO::Stream.new(peer, sync: false)
+					
+					return HTTP1::Server.new(stream, VERSION)
 				end
 				
 				def self.names

data/lib/async/http/protocol/http2.rb

@@ -45,7 +45,9 @@ module Async
 					::Protocol::HTTP2::Settings::ENABLE_CONNECT_PROTOCOL => 1,
 				}
 				
-				def self.client(stream, settings = CLIENT_SETTINGS)
+				def self.client(peer, settings = CLIENT_SETTINGS)
+					stream = IO::Stream.new(peer, sync: true, deferred: true)
+					
 					client = Client.new(stream)
 					
 					client.send_connection_preface(settings)
@@ -54,7 +56,9 @@ module Async
 					return client
 				end
 				
-				def self.server(stream, settings = SERVER_SETTINGS)
+				def self.server(peer, settings = SERVER_SETTINGS)
+					stream = IO::Stream.new(peer, sync: true, deferred: true)
+					
 					server = Server.new(stream)
 					
 					server.read_connection_preface(settings)
@@ -72,12 +76,12 @@ module Async
 						::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
 					)
 					
-					def self.client(stream, settings = CLIENT_SETTINGS)
-						HTTP2.client(stream, settings)
+					def self.client(peer, settings = CLIENT_SETTINGS)
+						HTTP2.client(peer, settings)
 					end
 					
-					def self.server(stream, settings = SERVER_SETTINGS)
-						HTTP2.server(stream, settings)
+					def self.server(peer, settings = SERVER_SETTINGS)
+						HTTP2.server(peer, settings)
 					end
 					
 					def self.names

data/lib/async/http/protocol/http2/connection.rb

@@ -74,12 +74,16 @@ module Async
 						@write_frame_guard.acquire do
 							super
 						end
+						
+						@stream.flush
 					end
 					
 					def write_frames(&block)
 						@write_frame_guard.acquire do
 							super
 						end
+						
+						@stream.flush
 					end
 					
 					def read_in_background(task: Task.current)
@@ -91,7 +95,7 @@ module Async
 									self.consume_window
 									self.read_frame
 								end
-							rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
+							rescue IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
 								# Ignore.
 							ensure
 								close($!)

data/lib/async/http/protocol/http2/server.rb

@@ -50,11 +50,14 @@ module Async
 					end
 					
 					def close(error = nil)
+						# This invokes Framer#close which closes the stream:
 						super
 						
-						# Stop the request loop:
-						@requests.enqueue nil
-						@requests = nil
+						if @requests
+							# Stop the request loop:
+							@requests.enqueue nil
+							@requests = nil
+						end
 					end
 					
 					def each

data/lib/async/http/protocol/https.rb

@@ -55,9 +55,9 @@ module Async
 					nil => HTTP11,
 				}
 				
-				def self.protocol_for(stream)
+				def self.protocol_for(peer)
 					# alpn_protocol is only available if openssl v1.0.2+
-					name = stream.io.alpn_protocol
+					name = peer.alpn_protocol
 					
 					Async.logger.debug(self) {"Negotiating protocol #{name.inspect}..."}
 					
@@ -68,12 +68,12 @@ module Async
 					end
 				end
 				
-				def self.client(stream)
-					protocol_for(stream).client(stream)
+				def self.client(peer)
+					protocol_for(peer).client(peer)
 				end
 				
-				def self.server(stream)
-					protocol_for(stream).server(stream)
+				def self.server(peer)
+					protocol_for(peer).server(peer)
 				end
 				
 				# Supported Application Layer Protocol Negotiation names:

data/lib/async/http/server.rb

@@ -44,8 +44,7 @@ module Async
 			attr :scheme
 			
 			def accept(peer, address, task: Task.current)
-				stream = Async::IO::Stream.new(peer)
-				connection = @protocol.server(stream)
+				connection = @protocol.server(peer)
 				
 				Async.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{@protocol}"}
 				
@@ -62,6 +61,8 @@ module Async
 					# If this returns nil, we assume that the connection has been hijacked.
 					self.call(request)
 				end
+			ensure
+				connection&.close
 			end
 			
 			def run

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.48.2"
+		VERSION = "0.49.0"
 	end
 end

data/tasks/server.rake

@@ -17,7 +17,7 @@ task :google do
 	require 'async'
 	require 'pry'
 	
-	Async.run do
+	Async do
 		endpoint = Async::HTTP::Endpoint.parse("https://www.google.com")
 		peer = endpoint.connect
 		stream = Async::IO::Stream.new(peer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.48.2
+  version: 0.49.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.19'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 1.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 1.27.0
 - !ruby/object:Gem::Dependency
   name: protocol-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ files:
 - examples/fetch/config.ru
 - examples/fetch/public/index.html
 - examples/fetch/public/stream.js
+- examples/google/search.rb
 - examples/request.rb
 - examples/trenni/Gemfile
 - examples/trenni/streaming.rb
@@ -263,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A HTTP client and server library.