wrap connection and timeout exceptions

binarycode · ioquatix · commit 04fd933683e0 · 2020-01-31T09:17:06.000+13:00
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -29,6 +29,19 @@ module Faraday
 			PERSISTENT = ::Faraday::Connection.instance_methods.include?(:close)
 			
 			class Adapter < ::Faraday::Adapter
+				CONNECTION_EXCEPTIONS = [
+					Errno::EADDRNOTAVAIL,
+					Errno::ECONNABORTED,
+					Errno::ECONNREFUSED,
+					Errno::ECONNRESET,
+					Errno::EHOSTUNREACH,
+					Errno::EINVAL,
+					Errno::ENETUNREACH,
+					Errno::EPIPE,
+					IOError,
+					SocketError
+				].freeze
+
 				def initialize(*arguments, **options, &block)
 					super
 					
@@ -48,6 +61,12 @@ def call(env)
 					save_response(env, response.status, response.read, response.headers)
 					
 					return @app.call(env)
+				rescue Errno::ETIMEDOUT => e
+					raise ::Faraday::TimeoutError, e
+				rescue OpenSSL::SSL::SSLError => e
+					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
diff --git a/spec/async/http/faraday/adapter_spec.rb b/spec/async/http/faraday/adapter_spec.rb
@@ -100,4 +100,8 @@ def get_response(url, path)
 			end.get('/index')
 		end
 	end
+
+	it 'wraps underlying exceptions into Faraday analogs' do
+		expect { get_response(endpoint.url, '/index') }.to raise_error(Faraday::ConnectionFailed)
+	end
 end
