async-http-faraday 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3de5d2e0aeda370b0fb885fb00abe5781492da63ee7ba7a0b36da91ea15df75
-  data.tar.gz: a5fc3ac76a50db186cadf826c4e458029b337574ad9771365f2015d0be30a276
+  metadata.gz: 461ee3d89afc1d0c8077b02f2bddfa4e9fd91e311fa810cb005aea26c0135b57
+  data.tar.gz: fc58f167759eaeadfe849ea631986a2f112bc959ec72ea2b7b9703b5126baf8c
 SHA512:
-  metadata.gz: 29096ef34c9bda8c50c62422cfd9a353c331d91fb3a61c8d621e90a0c8d7c0b12ff591f3e520e2c485a84e8f6c1519153d9c36f18e8a90bf627719d7787f6adb
-  data.tar.gz: 9ee7b48f082dc8297ff05164988095d2ffcb3954a6b68c86eb52e7a0d2f348f83a5dc7209232c71c898a0d53b522172b7210b6e1b5da0e98a88a69a8e07c8ff1
+  metadata.gz: 421f27bf1a380003fee2c76ba501a74984e01abc7a380bb5bd8f75452bbf2fa5cc3d25a135bd47813e8248ecff92d625f285e078e04c335c4df21831726fe324
+  data.tar.gz: 30993cd6afe2bd13f20178d8ca1b1560a47a20cc68f2e4bfbb456a4f59b5c55590d8a1319db0210abdca3c3dabc1a703867ac550d0f801efec3c7c3397039c07

data/lib/async/http/faraday/adapter.rb

@@ -23,7 +23,9 @@
 require 'faraday'
 require 'faraday/adapter'
 require 'kernel/sync'
-require 'async/http/internet'
+
+require 'async/http/client'
+require 'async/http/proxy'
 
 require_relative 'agent'
 
@@ -44,24 +46,83 @@ module Async
 					SocketError
 				].freeze
 				
-				def initialize(*arguments, **options, &block)
-					super
+				def initialize(*arguments, timeout: nil, **options, &block)
+					super(*arguments, **options)
+					
+					@timeout = timeout
+					
+					@clients = {}
+					
+					@options = options
+				end
+				
+				def make_client(endpoint)
+					Client.new(endpoint, **@connection_options)
+				end
+				
+				def host_key(endpoint)
+					url = endpoint.url.dup
 					
-					@internet = Async::HTTP::Internet.new
-					@persistent = options.fetch(:persistent, true)
-					@timeout = options[:timeout]
+					url.path = ""
+					url.fragment = nil
+					url.query = nil
+					
+					return url
+				end
+				
+				def client_for(endpoint)
+					key = host_key(endpoint)
+					
+					@clients.fetch(key) do
+						@clients[key] = make_client(endpoint)
+					end
+				end
+				
+				def proxy_client_for(proxy_endpoint, endpoint)
+					key = [host_key(proxy_endpoint), host_key(endpoint)]
+					
+					@clients.fetch(key) do
+						client = client_for(proxy_endpoint)
+						@clients[key] = client.proxied_client(endpoint)
+					end
 				end
 				
 				def close
-					@internet.close
+					# The order of operations here is to avoid a race condition between iterating over clients (#close may yield) and creating new clients.
+					clients = @clients.values
+					
+					@clients.clear
+					
+					clients.each(&:close)
 				end
 				
 				def call(env)
 					super
 					
 					Sync do
+						endpoint = Endpoint.new(env.url)
+						
+						if proxy = env.request.proxy
+							proxy_endpoint = Endpoint.new(proxy.uri)
+							client = self.proxy_client_for(proxy_endpoint, endpoint)
+						else
+							client = self.client_for(endpoint)
+						end
+						
+						if body = env.body
+							body = Body::Buffered.wrap(body)
+						end
+						
+						if headers = env.request_headers
+							headers = ::Protocol::HTTP::Headers[headers]
+						end
+						
+						method = env.method.upcase
+						
+						request = ::Protocol::HTTP::Request.new(endpoint.scheme, endpoint.authority, method, endpoint.path, nil, headers, body)
+						
 						with_timeout do
-							response = @internet.call(env[:method].to_s.upcase, env[:url].to_s, env[:request_headers], env[:body] || [])
+							response = client.call(request)
 							
 							save_response(env, response.status, response.read, response.headers)
 						end

data/lib/async/http/faraday/version.rb

@@ -23,7 +23,7 @@
 module Async
 	module HTTP
 		module Faraday
-			VERSION = "0.10.0"
+			VERSION = "0.11.0"
 		end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http-faraday
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Samuel Williams