httpx 0.7.0 → 0.8.0

data/lib/httpx/plugins/digest_authentication.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "digest"
+
 module HTTPX
   module Plugins
     #

data/lib/httpx/plugins/proxy.rb

@@ -179,20 +179,9 @@ module HTTPX
           super || @state == :connecting || @state == :connected
         end
 
-        def to_io
-          return super unless @options.proxy
-
-          case @state
-          when :idle
-            transition(:connecting)
-          when :connected
-            transition(:open)
-          end
-          @io.to_io
-        end
-
         def call
           super
+
           return unless @options.proxy
 
           case @state
@@ -210,11 +199,26 @@ module HTTPX
           emit(:close)
         end
 
+        private
+
+        def connect
+          return super unless @options.proxy
+
+          case @state
+          when :idle
+            transition(:connecting)
+          when :connected
+            transition(:open)
+          end
+        end
+
         def transition(nextstate)
           return super unless @options.proxy
 
           case nextstate
           when :closing
+            # this is a hack so that we can use the super method
+            # and it'll thing that the current state is open
             @state = :open if @state == :connecting
           end
           super

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

@@ -7,6 +7,10 @@ module HTTPX
     module Proxy
       module HTTP
         module ConnectionMethods
+          def connecting?
+            super || @state == :connecting || @state == :connected
+          end
+
           private
 
           def transition(nextstate)
@@ -34,7 +38,6 @@ module HTTPX
               when :idle
                 @parser = ProxyParser.new(@write_buffer, @options)
                 set_parser_callbacks(@parser)
-                @parser.on(:close) { transition(:closing) }
               end
             end
             super
@@ -48,7 +51,7 @@ module HTTPX
             #
             if req.uri.scheme == "https"
               connect_request = ConnectRequest.new(req.uri, @options)
-
+              @inflight += 1
               parser.send(connect_request)
             else
               transition(:connected)
@@ -56,6 +59,7 @@ module HTTPX
           end
 
           def __http_on_connect(_, response)
+            @inflight -= 1
             if response.status == 200
               req = @pending.first
               request_uri = req.uri
@@ -67,6 +71,7 @@ module HTTPX
               while (req = pending.shift)
                 req.emit(:response, response)
               end
+              reset
             end
           end
         end

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

@@ -39,7 +39,7 @@ module HTTPX
 
               @parser = nil
             end
-            log(level: 1, label: "SOCKS4: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" } unless nextstate == :open
+            log(level: 1) { "SOCKS4: #{nextstate}: #{@write_buffer.to_s.inspect}" } unless nextstate == :open
             super
           end
 

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

@@ -31,6 +31,10 @@ module HTTPX
             end
           end
 
+          def connecting?
+            super || @state == :authenticating || @state == :negotiating
+          end
+
           private
 
           def transition(nextstate)
@@ -60,7 +64,7 @@ module HTTPX
 
               @parser = nil
             end
-            log(level: 1, label: "SOCKS5: ") { "#{nextstate}: #{@write_buffer.to_s.inspect}" } unless nextstate == :open
+            log(level: 1) { "SOCKS5: #{nextstate}: #{@write_buffer.to_s.inspect}" } unless nextstate == :open
             super
           end
 

data/lib/httpx/plugins/push_promise.rb

@@ -43,9 +43,9 @@ module HTTPX
         end
 
         def __on_promise_request(parser, stream, h)
-          log(level: 1, label: "#{stream.id}: ") do
+          log(level: 1) do
             # :nocov:
-            h.map { |k, v| "-> PROMISE HEADER: #{k}: #{v}" }.join("\n")
+            h.map { |k, v| "#{stream.id}: -> PROMISE HEADER: #{k}: #{v}" }.join("\n")
             # :nocov:
           end
           headers = @options.headers_class.new(h)

data/lib/httpx/plugins/retries.rb

@@ -63,13 +63,19 @@ module HTTPX
         def fetch_response(request, connections, options)
           response = super
 
-          retry_on = options.retry_on
-
-          if response.is_a?(ErrorResponse) &&
+          if response &&
              request.retries.positive? &&
              __repeatable_request?(request, options) &&
-             __retryable_error?(response.error) &&
-             (!retry_on || retry_on.call(response))
+             (
+               # rubocop:disable Style/MultilineTernaryOperator
+               options.retry_on ?
+               options.retry_on.call(response) :
+               (
+                 response.is_a?(ErrorResponse) && __retryable_error?(response.error)
+               )
+               # rubocop:enable Style/MultilineTernaryOperator
+             )
+
             request.retries -= 1
             log { "failed to get response, #{request.retries} tries to go..." }
             request.transition(:idle)

data/lib/httpx/pool.rb

@@ -14,7 +14,7 @@ module HTTPX
 
     def initialize
       @resolvers = {}
-      @_resolver_monitors = {}
+      @_resolver_ios = {}
       @timers = Timers::Group.new
       @selector = Selector.new
       @connections = []
@@ -28,15 +28,13 @@ module HTTPX
     def next_tick
       catch(:jump_tick) do
         timeout = [next_timeout, @timers.wait_interval].compact.min
-        if timeout.negative?
+        if timeout && timeout.negative?
           @timers.fire
           throw(:jump_tick)
         end
 
-        @selector.select(timeout) do |monitor|
-          monitor.io.call
-          monitor.interests = monitor.io.interests
-        end
+        @selector.select(timeout, &:call)
+
         @timers.fire
       end
     rescue StandardError => e
@@ -86,7 +84,7 @@ module HTTPX
       resolver << connection
       return if resolver.empty?
 
-      @_resolver_monitors[resolver] ||= @selector.register(resolver, :w)
+      @_resolver_ios[resolver] ||= @selector.register(resolver)
     end
 
     def on_resolver_connection(connection)
@@ -118,8 +116,7 @@ module HTTPX
       @resolvers.delete(resolver_type)
 
       @selector.deregister(resolver)
-      monitor = @_resolver_monitors.delete(resolver)
-      monitor.close if monitor
+      @_resolver_ios.delete(resolver)
       resolver.close unless resolver.closed?
     end
 
@@ -128,10 +125,8 @@ module HTTPX
         # if open, an IO was passed upstream, therefore
         # consider it connected already.
         @connected_connections += 1
-        @selector.register(connection, :rw)
-      else
-        @selector.register(connection, :w)
       end
+      @selector.register(connection)
       connection.on(:close) do
         unregister_connection(connection)
       end

data/lib/httpx/registry.rb

@@ -64,7 +64,8 @@ module HTTPX
 
         case handler
         when Symbol, String
-          const_get(handler)
+          obj = const_get(handler)
+          @registry[tag] = obj
         else
           handler
         end

data/lib/httpx/request.rb

@@ -58,6 +58,12 @@ module HTTPX
       @state = :idle
     end
 
+    def interests
+      return :r if @state == :done || @state == :expect
+
+      :w
+    end
+
     # :nocov:
     if RUBY_VERSION < "2.2"
       # rubocop: disable Lint/UriEscapeUnescape:
@@ -219,6 +225,7 @@ module HTTPX
       case nextstate
       when :idle
         @response = nil
+        @drainer = nil
       when :headers
         return unless @state == :idle
       when :body

data/lib/httpx/resolver/https.rb

@@ -25,7 +25,7 @@ module HTTPX
 
     def_delegator :@connections, :empty?
 
-    def_delegators :@resolver_connection, :to_io, :call, :interests, :close
+    def_delegators :@resolver_connection, :connecting?, :to_io, :call, :close
 
     def initialize(options)
       @options = Options.new(options)
@@ -62,8 +62,20 @@ module HTTPX
       resolver_connection.closed?
     end
 
+    def interests
+      return if @queries.empty?
+
+      resolver_connection.__send__(__method__)
+    end
+
     private
 
+    def connect
+      return if @queries.empty?
+
+      resolver_connection.__send__(__method__)
+    end
+
     def pool
       Thread.current[:httpx_connection_pool] ||= Pool.new
     end
@@ -84,7 +96,7 @@ module HTTPX
 
       hostname = hostname || @queries.key(connection) || connection.origin.host
       type = @_record_types[hostname].first
-      log(label: "resolver: ") { "query #{type} for #{hostname}" }
+      log { "resolver: query #{type} for #{hostname}" }
       begin
         request = build_request(hostname, type)
         @requests[request] = connection
@@ -111,7 +123,7 @@ module HTTPX
     end
 
     def on_promise(_, stream)
-      log(level: 2, label: "#{stream.id}: ") { "refusing stream!" }
+      log(level: 2) { "#{stream.id}: refusing stream!" }
       stream.refuse
     end
 

data/lib/httpx/resolver/native.rb

@@ -73,14 +73,6 @@ module HTTPX
     end
 
     def to_io
-      case @state
-      when :idle
-        transition(:open)
-      when :closed
-        transition(:idle)
-        transition(:open)
-      end
-      resolve if @queries.empty?
       @io.to_io
     end
 
@@ -93,11 +85,7 @@ module HTTPX
     rescue Errno::EHOSTUNREACH => e
       @ns_index += 1
       if @ns_index < @nameserver.size
-        log(label: "resolver: ") do
-          # :nocov:
-          "failed resolving on nameserver #{@nameserver[@ns_index - 1]} (#{e.message})"
-          # :nocov:
-        end
+        log { "resolver: failed resolving on nameserver #{@nameserver[@ns_index - 1]} (#{e.message})" }
         transition(:idle)
       else
         handle_error(e)
@@ -107,6 +95,14 @@ module HTTPX
     end
 
     def interests
+      case @state
+      when :idle
+        transition(:open)
+      when :closed
+        transition(:idle)
+        transition(:open)
+      end
+
       !@write_buffer.empty? || @queries.empty? ? :w : :r
     end
 
@@ -160,11 +156,7 @@ module HTTPX
           raise NativeResolveError.new(connection, host)
         else
           connections << connection
-          log(label: "resolver: ") do
-            # :nocov:
-            "timeout after #{prev_timeout}s, retry(#{timeouts.first}) #{host}..."
-            # :nocov:
-          end
+          log { "resolver: timeout after #{prev_timeout}s, retry(#{timeouts.first}) #{host}..." }
         end
       end
       @queries = queries
@@ -174,14 +166,11 @@ module HTTPX
     def dread(wsize = @resolver_options.packet_size)
       loop do
         siz = @io.read(wsize, @read_buffer)
-        unless siz
-          emit(:close)
-          return
-        end
-        return if siz.zero?
+        return unless siz && siz.positive?
 
-        log(label: "resolver: ") { "READ: #{siz} bytes..." }
+        log { "resolver: READ: #{siz} bytes..." }
         parse(@read_buffer)
+        return if @state == :closed
       end
     end
 
@@ -190,12 +179,10 @@ module HTTPX
         return if @write_buffer.empty?
 
         siz = @io.write(@write_buffer)
-        unless siz
-          emit(:close)
-          return
-        end
-        log(label: "resolver: ") { "WRITE: #{siz} bytes..." }
-        return if siz.zero?
+        return unless siz && siz.positive?
+
+        log { "resolver: WRITE: #{siz} bytes..." }
+        return if @state == :closed
       end
     end
 
@@ -253,7 +240,7 @@ module HTTPX
       hostname = hostname || @queries.key(connection) || connection.origin.host
       @queries[hostname] = connection
       type = @_record_types[hostname].first
-      log(label: "resolver: ") { "query #{type} for #{hostname}" }
+      log { "resolver: query #{type} for #{hostname}" }
       begin
         @write_buffer << Resolver.encode_dns_query(hostname, type: RECORD_TYPES[type])
       rescue Resolv::DNS::EncodeError => e
@@ -269,7 +256,7 @@ module HTTPX
       uri = URI::Generic.build(scheme: "udp", port: port)
       uri.hostname = ip
       type = IO.registry(uri.scheme)
-      log(label: "resolver: ") { "server: #{uri}..." }
+      log { "resolver: server: #{uri}..." }
       @io = type.new(uri, [IPAddr.new(ip)], @options)
     end
 
@@ -285,8 +272,11 @@ module HTTPX
         return unless @state == :idle
 
         build_socket
+
         @io.connect
         return unless @io.connected?
+
+        resolve if @queries.empty?
       when :closed
         return unless @state == :open
 

data/lib/httpx/resolver/options.rb

@@ -6,7 +6,7 @@ module HTTPX
       @options = options
     end
 
-    def method_missing(m, *args, &block)
+    def method_missing(m, *, &block)
       if @options.key?(m)
         @options[m]
       else
@@ -14,7 +14,7 @@ module HTTPX
       end
     end
 
-    def respond_to_missing?(m)
+    def respond_to_missing?(m, *)
       @options.key?(m) || super
     end
 

data/lib/httpx/resolver/resolver_mixin.rb

@@ -30,7 +30,7 @@ module HTTPX
         addresses.map! do |address|
           address.is_a?(IPAddr) ? address : IPAddr.new(address.to_s)
         end
-        log(label: "resolver: ") { "answer #{connection.origin.host}: #{addresses.inspect}" }
+        log { "resolver: answer #{connection.origin.host}: #{addresses.inspect}" }
         connection.addresses = addresses
         catch(:coalesced) { emit(:resolve, connection) }
       end