Add support for proxy. Fixes #18.

ioquatix · ioquatix · commit 0e9c40a9aaaa · 2021-06-17T19:03:37.000+12:00
diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml
@@ -11,7 +11,7 @@ jobs:
       matrix:
         os:
           - ubuntu
-          - macos
+          # - macos
         
         ruby:
           - "2.6"
@@ -32,6 +32,10 @@ jobs:
             ruby: head
             experimental: true
     
+    services:
+      squid:
+        image: sameersbn/squid
+    
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
@@ -41,4 +45,6 @@ jobs:
     
     - name: Run tests
       timeout-minutes: 5
+      env:
+        PROXY_URL: "http://localhost:3128"
       run: ${{matrix.env}} bundle exec rspec
diff --git a/lib/async/http/faraday/adapter.rb b/lib/async/http/faraday/adapter.rb
@@ -60,8 +60,29 @@ def call(env)
 					super
 					
 					Sync do
+						endpoint = Endpoint.parse(env[:url].to_s)
+						
+						if proxy = env[:proxy]
+							proxy_endpoint = Endpoint.parse(proxy)
+							client = @internet.client_for(proxy_endpoint).proxied_endpoint(endpoint)
+						else
+							client = @internet.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].to_s.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
diff --git a/spec/async/http/faraday/adapter/proxy_spec.rb b/spec/async/http/faraday/adapter/proxy_spec.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# Copyright, 2017, 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.
+
+require 'async/http/faraday'
+require 'async/http/server'
+require 'async/http/endpoint'
+
+require 'async'
+
+RSpec.describe Async::HTTP::Faraday::Adapter, if: ENV.key?('PROXY_URL') do
+	include_context Async::RSpec::Reactor
+	
+	def get_response(url = endpoint.url, path = '/index', adapter_options: {})
+		connection = Faraday.new(url: url) do |faraday|
+			faraday.response :logger
+			faraday.adapter :async_http, **adapter_options
+		end
+		
+		connection.get(path, proxy: ENV['PROXY_URL'])
+	end
+	
+	it "can get remote resource via proxy" do
+		Async do
+			response = get_response('http://www.google.com', '/search?q=cats')
+			
+			expect(response).to be_success
+		end
+	end
+end
