httpx 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8a8f66dc2833078c5d718a91b0aa5ab0f3cfd0ddfa021ddebe491dc8a74cda1
-  data.tar.gz: b722b06b29af3a535efdc5da32298c358b5cb91ab248224fe21bc5f15982cbfb
+  metadata.gz: 54a10e717268eab1bd790ceb5488f7641814e96f0edc7ff2252d020a73f956d4
+  data.tar.gz: fac249b2c424c310e8535bdd8940dfeec194b5438e30876da6a3875f349d49ab
 SHA512:
-  metadata.gz: c2a70d09852cf6612b50cf13fa54cdb71111bec0583f12830d58a5e042b0dae316e84d3e4b4db132bad77cda88fefd7d7cdd3c6b9ab288c08fdc573b8ff2e3fb
-  data.tar.gz: fd164d361e5e9b3d7c7439567c014a748c6eedb4b1887ff20213f653ea7234ca5567cd96bc71d651637049bf6405751f46fe423638ae1b820dac4767b2434fc9
+  metadata.gz: 044c55f050be59ec7ef78bde8529b1957d120538c89d1488991b07d87cc60b34c66999861fe48b01719e712dd7ab1f03f349890e4ccc074303788b30798a5a90
+  data.tar.gz: 0a6b3a24a7d35e7cba39df0b58519b15c15361a96a2e458a1a0bab890a62922ed0cb34881cc506031d8be4a95505444e1401f4570f5d5286372baea548d4b2be

data/lib/httpx/connection.rb

@@ -254,8 +254,7 @@ module HTTPX
     end
 
     def send_pending
-      while !@write_buffer.full? && (req_args = @pending.shift)
-        request = req_args
+      while !@write_buffer.full? && (request = @pending.shift)
         parser.send(request)
       end
     end
@@ -368,7 +367,7 @@ module HTTPX
       end
 
       parser.handle_error(error) if @parser && parser.respond_to?(:handle_error)
-      @pending.each do |request|
+      while (request = @pending.shift)
         request.emit(:response, ErrorResponse.new(request, error, @options))
       end
     end

data/lib/httpx/io/udp.rb

@@ -24,8 +24,18 @@ module HTTPX
       true
     end
 
-    def close
-      @io.close
+    if RUBY_VERSION < "2.2"
+      # :nocov:
+      def close
+        @io.close
+      rescue StandardError
+        nil
+      end
+      # :nocov:
+    else
+      def close
+        @io.close
+      end
     end
 
     def write(buffer)

data/lib/httpx/options.rb

@@ -61,6 +61,7 @@ module HTTPX
         :transport_options => nil,
         :persistent => false,
         :resolver_class => (ENV["HTTPX_RESOLVER"] || :native).to_sym,
+        :resolver_options => { cache: true },
       }
 
       defaults.merge!(options)

data/lib/httpx/plugins/proxy.rb

@@ -204,6 +204,16 @@ module HTTPX
           transition(:closed)
           emit(:close)
         end
+
+        def transition(nextstate)
+          return super unless @options.proxy
+
+          case nextstate
+          when :closing
+            @state = :open if @state == :connecting
+          end
+          super
+        end
       end
     end
     register_plugin :proxy, Proxy

data/lib/httpx/plugins/proxy/http.rb

@@ -41,7 +41,7 @@ module HTTPX
           end
 
           def __http_proxy_connect
-            req, _ = @pending.first
+            req = @pending.first
             # if the first request after CONNECT is to an https address, it is assumed that
             # all requests in the queue are not only ALL HTTPS, but they also share the certificate,
             # and therefore, will share the connection.
@@ -55,17 +55,17 @@ module HTTPX
             end
           end
 
-          def __http_on_connect(_request, response)
+          def __http_on_connect(_, response)
             if response.status == 200
-              req, _ = @pending.first
+              req = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options)
               transition(:connected)
               throw(:called)
             else
-              pending = @pending.map(&:first) + @parser.pending
+              pending = @pending + @parser.pending
               while (req = pending.shift)
-                emit(:response, req, response)
+                req.emit(:response, response)
               end
             end
           end
@@ -78,6 +78,8 @@ module HTTPX
 
           def set_request_headers(request)
             super
+            proxy_params = @options.proxy
+            request.headers["proxy-authorization"] = "Basic #{proxy_params.token_authentication}" if proxy_params.authenticated?
             request.headers["proxy-connection"] = request.headers["connection"]
             request.headers.delete("connection")
           end
@@ -102,10 +104,8 @@ module HTTPX
         end
 
         class ConnectRequest < Request
-          def initialize(uri, options)
+          def initialize(uri, _options)
             super(:connect, uri, {})
-            proxy_params = options.proxy
-            @headers["proxy-authentication"] = "Basic #{proxy_params.token_authentication}" if proxy_params.authenticated?
             @headers.delete("accept")
           end
 

data/lib/httpx/plugins/proxy/socks4.rb

@@ -28,7 +28,7 @@ module HTTPX
               @io.connect
               return unless @io.connected?
 
-              req, _ = @pending.first
+              req = @pending.first
               return unless req
 
               request_uri = req.uri
@@ -51,7 +51,7 @@ module HTTPX
           def __socks4_on_packet(packet)
             _version, status, _port, _ip = packet.unpack("CCnN")
             if status == GRANTED
-              req, _ = @pending.first
+              req = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options) if request_uri.scheme == "https"
               transition(:connected)

data/lib/httpx/plugins/proxy/socks5.rb

@@ -52,7 +52,7 @@ module HTTPX
             when :negotiating
               return unless @state == :connecting || @state == :authenticating
 
-              req, _ = @pending.first
+              req = @pending.first
               request_uri = req.uri
               @write_buffer << Packet.connect(request_uri)
             when :connected
@@ -93,7 +93,7 @@ module HTTPX
               version, reply, = packet.unpack("CC")
               __socks5_check_version(version)
               __on_socks5_error("socks5 negotiation error: #{reply}") unless reply == SUCCESS
-              req, _ = @pending.first
+              req = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options) if request_uri.scheme == "https"
               transition(:connected)

data/lib/httpx/resolver/https.rb

@@ -121,6 +121,7 @@ module HTTPX
       rescue Resolv::DNS::DecodeError, JSON::JSONError => e
         host, connection = @queries.first
         if @_record_types[host].empty?
+          @queries.delete(host)
           emit_resolve_error(connection, host, e)
           return
         end
@@ -129,6 +130,7 @@ module HTTPX
         host, connection = @queries.first
         @_record_types[host].shift
         if @_record_types[host].empty?
+          @queries.delete(host)
           @_record_types.delete(host)
           emit_resolve_error(connection, host)
           return
@@ -158,7 +160,7 @@ module HTTPX
           next unless connection # probably a retried query for which there's an answer
 
           @connections.delete(connection)
-          Resolver.cached_lookup_set(hostname, addresses)
+          Resolver.cached_lookup_set(hostname, addresses) if @resolver_options.cache
           emit_addresses(connection, addresses.map { |addr| addr["data"] })
         end
       end

data/lib/httpx/resolver/native.rb

@@ -59,7 +59,7 @@ module HTTPX
       @_record_types = Hash.new { |types, host| types[host] = @resolver_options.record_types.dup }
       @connections = []
       @queries = {}
-      @read_buffer = Buffer.new(@resolver_options.packet_size)
+      @read_buffer = "".b
       @write_buffer = Buffer.new(@resolver_options.packet_size)
       @state = :idle
     end
@@ -90,8 +90,7 @@ module HTTPX
         consume
       end
       nil
-    rescue Errno::EHOSTUNREACH,
-           NativeResolveError => e
+    rescue Errno::EHOSTUNREACH => e
       @ns_index += 1
       if @ns_index < @nameserver.size
         log(label: "resolver: ") do
@@ -101,25 +100,14 @@ module HTTPX
         end
         transition(:idle)
       else
-        if e.respond_to?(:connection) &&
-           e.respond_to?(:host)
-          emit_resolve_error(e.connection, e.host, e)
-        else
-          @queries.each do |host, connection|
-            emit_resolve_error(connection, host, e)
-          end
-        end
+        handle_error(e)
       end
+    rescue NativeResolveError => e
+      handle_error(e)
     end
 
     def interests
-      readable = !@read_buffer.full?
-      writable = !@write_buffer.empty?
-      if readable
-        writable ? :rw : :r
-      else
-        writable ? :w : :r
-      end
+      !@write_buffer.empty? || @queries.empty? ? :w : :r
     end
 
     def <<(connection)
@@ -168,6 +156,7 @@ module HTTPX
         @timeouts[host].shift
         if @timeouts[host].empty?
           @timeouts.delete(host)
+          @connections.delete(connection)
           raise NativeResolveError.new(connection, host)
         else
           connections << connection
@@ -182,7 +171,7 @@ module HTTPX
       connections.each { |ch| resolve(ch) }
     end
 
-    def dread(wsize = @read_buffer.limit)
+    def dread(wsize = @resolver_options.packet_size)
       loop do
         siz = @io.read(wsize, @read_buffer)
         unless siz
@@ -192,7 +181,7 @@ module HTTPX
         return if siz.zero?
 
         log(label: "resolver: ") { "READ: #{siz} bytes..." }
-        parse(@read_buffer.to_s)
+        parse(@read_buffer)
       end
     end
 
@@ -216,6 +205,8 @@ module HTTPX
       rescue Resolv::DNS::DecodeError => e
         hostname, connection = @queries.first
         if @_record_types[hostname].empty?
+          @queries.delete(hostname)
+          @connections.delete(connection)
           ex = NativeResolveError.new(connection, hostname, e.message)
           ex.set_backtrace(e.backtrace)
           raise ex
@@ -226,7 +217,9 @@ module HTTPX
         hostname, connection = @queries.first
         @_record_types[hostname].shift
         if @_record_types[hostname].empty?
+          @queries.delete(hostname)
           @_record_types.delete(hostname)
+          @connections.delete(connection)
           raise NativeResolveError.new(connection, hostname)
         end
       else
@@ -244,7 +237,7 @@ module HTTPX
           end
         else
           @connections.delete(connection)
-          Resolver.cached_lookup_set(connection.origin.host, addresses)
+          Resolver.cached_lookup_set(connection.origin.host, addresses) if @resolver_options.cache
           emit_addresses(connection, addresses.map { |addr| addr["data"] })
         end
       end
@@ -301,5 +294,16 @@ module HTTPX
       end
       @state = nextstate
     end
+
+    def handle_error(error)
+      if error.respond_to?(:connection) &&
+         error.respond_to?(:host)
+        emit_resolve_error(error.connection, error.host, error)
+      else
+        @queries.each do |host, connection|
+          emit_resolve_error(connection, host, error)
+        end
+      end
+    end
   end
 end

data/lib/httpx/resolver/resolver_mixin.rb

@@ -38,7 +38,7 @@ module HTTPX
       def early_resolve(connection, hostname: connection.origin.host)
         addresses = connection.addresses ||
                     ip_resolve(hostname) ||
-                    Resolver.cached_lookup(hostname) ||
+                    (@resolver_options.cache && Resolver.cached_lookup(hostname)) ||
                     system_resolve(hostname)
         return unless addresses
 
@@ -58,10 +58,14 @@ module HTTPX
       end
 
       def emit_resolve_error(connection, hostname, ex = nil)
+        emit(:error, connection, resolve_error(hostname, ex))
+      end
+
+      def resolve_error(hostname, ex = nil)
         message = ex ? ex.message : "Can't resolve #{hostname}"
         error = ResolveError.new(message)
         error.set_backtrace(ex ? ex.backtrace : caller)
-        emit(:error, connection, error)
+        error
       end
     end
   end

data/lib/httpx/resolver/system.rb

@@ -14,10 +14,13 @@ module HTTPX
 
     def initialize(options)
       @options = Options.new(options)
-      roptions = @options.resolver_options
+      @resolver_options = Resolver::Options.new(@options.resolver_options)
       @state = :idle
-      @resolver = Resolv::DNS.new(roptions.nil? ? nil : roptions)
-      @resolver.timeouts = roptions[:timeouts] if roptions
+      resolv_options = @resolver_options.to_h
+      timeouts = resolv_options.delete(:timeouts)
+      resolv_options.delete(:cache)
+      @resolver = Resolv::DNS.new(resolv_options.empty? ? nil : resolv_options)
+      @resolver.timeouts = timeouts if timeouts
     end
 
     def closed?
@@ -34,7 +37,7 @@ module HTTPX
                   ip_resolve(hostname) ||
                   system_resolve(hostname) ||
                   @resolver.getaddresses(hostname)
-      return emit_resolve_error(connection, hostname) if addresses.empty?
+      throw(:resolve_error, resolve_error(hostname)) if addresses.empty?
 
       emit_addresses(connection, addresses)
     rescue Errno::EHOSTUNREACH, *RESOLV_ERRORS => e

data/lib/httpx/session.rb

@@ -152,9 +152,14 @@ module HTTPX
       request_options = @options.merge(options)
 
       requests.each do |request|
-        connection = find_connection(request, connections, request_options)
-        connection.send(request)
-        set_request_timeout(connection, request, request_options)
+        error = catch(:resolve_error) do
+          connection = find_connection(request, connections, request_options)
+          connection.send(request)
+          set_request_timeout(connection, request, request_options)
+        end
+        next unless error.is_a?(ResolveError)
+
+        request.emit(:response, ErrorResponse.new(request, error, options))
       end
 
       responses = []

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next