Better support for running without top level reactor.

ioquatix · ioquatix · commit bab27db81742 · 2020-04-09T11:50:46.000+12:00
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -20,8 +20,11 @@
 
 require 'faraday'
 require 'faraday/adapter'
+require 'kernel/sync'
 require 'async/http/internet'
 
+require_relative 'agent'
+
 module Async
 	module HTTP
 		module Faraday
@@ -57,10 +60,20 @@ def close
 				def call(env)
 					super
 					
-					with_timeout do
-						response = @internet.call(env[:method].to_s.upcase, env[:url].to_s, env[:request_headers], env[:body] || [])
+					parent = Async::Task.current?
 					
-						save_response(env, response.status, response.read, response.headers)
+					Sync do
+						with_timeout do
+							response = @internet.call(env[:method].to_s.upcase, env[:url].to_s, env[:request_headers], env[:body] || [])
+						
+							save_response(env, response.status, response.read, response.headers)
+						end
+					ensure
+						# If we are the top level task, even if we are persistent, we must close the connection:
+						if parent.nil? || !@persistent
+							Async.logger.debug(self) {"Closing persistent connections."}
+							@internet.close
+						end
 					end
 					
 					return @app.call(env)
@@ -70,9 +83,6 @@ def call(env)
 					raise ::Faraday::SSLError, e
 				rescue *CONNECTION_EXCEPTIONS => e
 					raise ::Faraday::ConnectionFailed, e
-				ensure
-					# Don't retain persistent connections unless they will eventually be closed:
-					@internet.close unless @persistent
 				end
 
 				private
diff --git a/lib/async/http/faraday/agent.rb b/lib/async/http/faraday/agent.rb
@@ -0,0 +1,34 @@
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+begin
+	require 'sawyer/agent'
+	
+	# This is a nasty hack until https://github.com/lostisland/sawyer/pull/67 is resolved:
+	unless Sawyer::Agent.instance_methods.include?(:close)
+		class Sawyer::Agent
+			def close
+				@conn.close if @conn.respond_to?(:close)
+			end
+		end
+	end
+rescue LoadError
+	# Ignore.
+end
diff --git a/spec/async/http/faraday/adapter_spec.rb b/spec/async/http/faraday/adapter_spec.rb
@@ -71,6 +71,12 @@ def get_response(url = endpoint.url, path = '/index', adapter_options: {})
 		end
 	end
 	
+	it "works without top level reactor" do
+		response = get_response("https://www.google.com", "/search?q=ruby")
+		
+		expect(response).to be_success
+	end
+	
 	it "can get remote resource" do
 		Async do
 			response = get_response('http://www.google.com', '/search?q=cats')
