async-http 0.38.1 → 0.38.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83a5e5bd7e766404f4011a11d61d6cfcc75d1cff40c1822895f21f71ccf91925
-  data.tar.gz: ecdde5ee1128a0ee9f947a1da217c683fda1c65c281dba0694ff72749a31ca9f
+  metadata.gz: 4de4d97aa888d6458d22577150d9d7bb24d90fbfbe29c5c81d106874d0451098
+  data.tar.gz: bdf58708f82a9135b1d5a3ead916b3eb4a2766d79852304259de317e01896bfd
 SHA512:
-  metadata.gz: ce5c4265e43776b208ef51ebcb5b54b84f0b86e7d8d52dbccf3905869fc6094ec88d74b6afb35eba557ffcae0699dae5f130e7b72f507ac989c28e2904e55fbb
-  data.tar.gz: 74b16c8ad259f0aaded61ef8094d26043354b717d299c3de04b2a4aab0169b74ebc2808f889ff284468a5ffabd4ad1a2f0e988dd67b268d3a8660303df9b7fe3
+  metadata.gz: ca58c3bea25933b04cf306130ff31f3e0770fa0964b2411942fac897eb70862a30668bebaee6eaf22a92e571c178e47be27b39b510679889a3f36b0124054bf0
+  data.tar.gz: a1182f2f385ba1bf529511085ae8523faae36267a54586101bcbdf0b225d475285661830d8cfc323ecf310094979e30a6115ee6cab94bcaa87025b72644eaceb

data/README.md

@@ -123,6 +123,50 @@ Async::Reactor.run do |task|
 end
 ```
 
+### Advanced Verification
+
+You can hook into SSL certificate verification to improve server verification.
+
+```ruby
+require 'async'
+require 'async/http'
+
+# These are generated from the certificate chain that the server presented.
+trusted_fingerprints = {
+	"dac9024f54d8f6df94935fb1732638ca6ad77c13" => true,
+	"e6a3b45b062d509b3382282d196efe97d5956ccb" => true,
+	"07d63f4c05a03f1c306f9941b8ebf57598719ea2" => true,
+	"e8d994f44ff20dc78dbff4e59d7da93900572bbf" => true,
+}
+
+Async do
+	endpoint = Async::HTTP::URLEndpoint.parse("https://www.codeotaku.com/index")
+	
+	# This is a quick hack/POC:
+	ssl_context = endpoint.ssl_context
+	
+	ssl_context.verify_callback = proc do |verified, store_context|
+		certificate = store_context.current_cert
+		fingerprint = OpenSSL::Digest::SHA1.new(certificate.to_der).to_s
+		
+		if trusted_fingerprints.include? fingerprint
+			true
+		else
+			Async.logger.warn("Untrusted Certificate Fingerprint"){fingerprint}
+			false
+		end
+	end
+	
+	endpoint = endpoint.with(ssl_context: ssl_context)
+	
+	client = Async::HTTP::Client.new(endpoint)
+	
+	response = client.get(endpoint.path)
+	
+	pp response.status, response.headers.fields, response.read
+end
+```
+
 ## Performance
 
 On a 4-core 8-thread i7, running `ab` which uses discrete (non-keep-alive) connections:

data/examples/trenni/Gemfile

@@ -0,0 +1,5 @@
+
+source 'https://rubygems.org'
+
+gem "trenni"
+gem "async-http"

data/examples/trenni/streaming.rb

@@ -0,0 +1,35 @@
+
+require 'trenni/template'
+
+require 'async'
+require 'async/http/body/writable'
+
+# The template, using inline text. The sleep could be anything - database query, HTTP request, redis, etc.
+buffer = Trenni::Buffer.new(<<-EOF)
+The "\#{self[:count]} bottles of \#{self[:drink]} on the wall" song!
+
+<?r self[:count].downto(1) do |index| ?>
+	\#{index} bottles of \#{self[:drink]} on the wall,
+	\#{index} bottles of \#{self[:drink]},
+	take one down, and pass it around,
+	\#{index - 1} bottles of \#{self[:drink]} on the wall.
+	
+	<?r Async::Task.current.sleep(1) ?>
+<?r end ?>
+EOF
+
+template = Trenni::Template.new(buffer)
+
+Async do
+	body = Async::HTTP::Body::Writable.new
+
+	generator = Async do
+		template.to_string({count: 100, drink: 'coffee'}, body)
+	end
+
+	while chunk = body.read
+		$stdout.write chunk
+	end
+	
+	generator.wait
+end.wait

data/lib/async/http/body/buffered.rb

@@ -32,6 +32,8 @@ module Async
 						return body
 					elsif body.is_a? Array
 						return self.new(body)
+					elsif body.is_a?(String)
+						return self.new([body])
 					elsif body
 						return self.for(body)
 					end

data/lib/async/http/client.rb

@@ -28,6 +28,11 @@ require_relative 'middleware'
 module Async
 	module HTTP
 		class Client
+			# Provides a robust interface to a server.
+			# * If there are no connections, it will create one.
+			# * If there are already connections, it will reuse it.
+			# * If a request fails, it will retry it up to N times if it was idempotent.
+			# The client object will never become unusable. It internally manages persistent connections (or non-persistent connections if that's required).
 			def initialize(endpoint, protocol = endpoint.protocol, scheme = endpoint.scheme, authority = endpoint.authority, retries: 3, connection_limit: nil)
 				@endpoint = endpoint
 				@protocol = protocol
@@ -91,7 +96,6 @@ module Async
 					# 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
 					
-					attempt += 1
 					if attempt < @retries
 						retry
 					else

data/lib/async/http/url_endpoint.rb

@@ -34,10 +34,15 @@ module Async
 				self.new(url, **options)
 			end
 			
+			# @option scheme [String] the scheme to use, overrides the URL scheme.
+			# @option port [Integer] the port to bind to, overrides the URL port.
+			# @option hostname [String] the hostname to use, overrides the URL hostname.
+			# @option ssl_context [OpenSSL::SSL::SSLContext] the context to use for TLS.
+			# @option alpn_protocols [Array<String>] the alpn protocols to negotiate.
 			def initialize(url, endpoint = nil, **options)
 				super(**options)
 				
-				raise ArgumentError.new("URL must be absolute (include scheme, host): #{url}") unless url.absolute?
+				raise ArgumentError, "URL must be absolute (include scheme, host): #{url}" unless url.absolute?
 				
 				@url = url
 				@endpoint = endpoint
@@ -143,10 +148,15 @@ module Async
 			end
 			
 			def tcp_options
-				{
-					reuse_port: self.reuse_port,
-					timeout: self.timeout,
-				}
+				options = @options.dup
+				
+				options.delete(:scheme)
+				options.delete(:port)
+				options.delete(:hostname)
+				options.delete(:ssl_context)
+				options.delete(:alpn_protocols)
+				
+				return options
 			end
 			
 			def build_endpoint(endpoint = nil)
@@ -172,8 +182,8 @@ module Async
 				endpoint.bind(*args, &block)
 			end
 			
-			def connect(*args, &block)
-				endpoint.connect(*args, &block)
+			def connect(&block)
+				endpoint.connect(&block)
 			end
 			
 			def each

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.38.1"
+		VERSION = "0.38.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.38.1
+  version: 0.38.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -144,6 +144,8 @@ files:
 - examples/fetch/public/index.html
 - examples/fetch/public/stream.js
 - examples/request.rb
+- examples/trenni/Gemfile
+- examples/trenni/streaming.rb
 - examples/upload/client.rb
 - examples/upload/data.txt
 - examples/upload/server.rb
@@ -219,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A HTTP client and server library.