Add support for persistent connections.

ioquatix · ioquatix · commit e77ae81bd2e9 · 2019-12-23T14:57:20.000+13:00
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "faraday", git: "https://github.com/lostisland/faraday.git"
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -20,32 +20,36 @@
 
 require 'faraday'
 require 'faraday/adapter'
-require 'async/http/client'
+require 'async/http/internet'
 
 module Async
 	module HTTP
 		module Faraday
+			# Detect whether we can use persistent connections:
+			PERSISTENT = ::Faraday::Connection.instance_methods.include?(:close)
+			
 			class Adapter < ::Faraday::Adapter
+				def initialize(*arguments, **options, &block)
+					super
+					
+					@internet = Async::HTTP::Internet.new
+				end
+				
+				def close
+					@internet.close
+				end
+				
 				def call(env)
 					super
 					
-					client = HTTP::Client.new(*endpoints_for(env).to_a)
+					response = @internet.call(env[:method], env[:url].to_s, env[:request_headers], env[:body])
 					
-					response = client.send(env[:method], env[:url].request_uri, env[:request_headers], env[:body] || [])
-
 					save_response(env, response.status, response.read, response.headers)
 					
-					@app.call env
+					return @app.call(env)
 				ensure
-					client.close if client
-				end
-				
-				def endpoints_for(env)
-					return to_enum(:endpoints_for, env) unless block_given?
-					
-					if url = env[:url]
-						yield Async::HTTP::Endpoint.new(url)
-					end
+					# Don't retain persistent connections unless they will eventually be closed:
+					@internet.close unless PERSISTENT
 				end
 			end
 		end
diff --git a/spec/async/http/faraday/adapter_spec.rb b/spec/async/http/faraday/adapter_spec.rb
@@ -53,6 +53,9 @@ def get_response(url, path)
 		end
 
 		connection.get(path)
+	
+	ensure
+		connection&.close
 	end
 
 	it "client can get resource" do

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 source 'https://rubygems.org'
 gemspec
++
 +gem "faraday", git: "https://github.com/lostisland/faraday.git"