httpx 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74104ce6c4d05053e2a005974de5f0cd66346a1cb4558b7c0887d3a2d691d226
-  data.tar.gz: ca0ce3e30f509d44e4c0daac30a0b5d9949c118c19a715561c276f1debaf5dbf
+  metadata.gz: eece37bd091a7fea17ccc62eca63acaee714c08658d081a938fc38495a4c8813
+  data.tar.gz: 72dcd038803106f08a0317c8d7bc97d22d6cdf5c469ba8f8f9d380d00e8f5ea7
 SHA512:
-  metadata.gz: 0de3c6baf56c86272cc45bdc06e1187655e759ddf329414d71fcbf4603c9d0e03791641e05f5c07ef84cd578a3bba1a855fde77b5b0f1f2e11df1cf60ea0815a
-  data.tar.gz: a276c6ed937c8d04103382d517d56d9df805886f23b05a38f6e654fcd6935e17407101e1eedc2b6605b4f347a37262116024a61633ebdd660131b06fc1f3fde9
+  metadata.gz: 5af43571f7da30f709883474fb61ef3661b31fa836d249c423726f4815fb7b2bf5c1281e22ca7ad15c00ed26b2ffc950d521b14a9f5c02e7d95d4198b4b986d0
+  data.tar.gz: bd73537be9a610b590d7897cd96f7b6213ece24ea7079ce995a3e05cbee363dcf0f575405ea8d2e612a64737e3bbc70dbdc25ab9a24f5b7e154b9a5187974ffe

data/doc/release_notes/1_7_1.md

@@ -17,5 +17,4 @@
 * `:stream_bidi` plugin: fix internal state preventing bidi requests from being retried.
 * `:stream_bidi` plugin: will only allow initial request body being passed using `:body` param (others, like `:json`, will raise an exception)
 * https resolver: return `:idle` on `#state` calls when no connection is available (sometimes called in internal log messages).
-* selector loop fix: when there are no selectables and an interval is passed, sleep instead of returning (thereby avoiding potential busy loop).
-*
+* selector loop fix: when there are no selectables and an interval is passed, sleep instead of returning (thereby avoiding potential busy loop).

data/doc/release_notes/1_8_1.md

@@ -0,0 +1,27 @@
+# 1.8.1
+
+## Improvements
+
+* the session will now eagerly write initial data to connections instead of waiting for I/O the first time (saves a syscall).
+* removed all rescue blocks rescuing `StandardError` internally; this could interfere with usages of `httpx` inside `Timeout.timeout` blocks, which may emit an exception at any point, including in blocks where that exception could be rescued, leaving the session in a potentially irrecoverable state and looping.
+* debug logs change the display of ids from 'tid:123, fid:123' to 'tid=123 fid:123'.
+  * and when using the `datadog` adapter, all related correlation ids (trace id, span id, etc) will also be added to the identifiers in the same format
+* plugins built on top of the `:retries` plugin will skip the `retry_after` interval when certain conditions are met.
+  * `:persistent` plugin: request will be retried immediately, when the error happens after the keep alive interval expired.
+  * `:auth` plugin: request will be retried immediately if it failed due to a "401 Unauthorized Error".
+* `:ssrf_filter` plugin: removed public/private references of exception message.
+
+## Bugfixes
+
+* `:auth` plugin: handle edge case where `:auth_header_expires_at` returns no value.
+* `:digest_auth` plugin: do not retry if there was an issue building building the authorization header after the probe.
+* `webmock` adapter: prevent mocked requests from opening a connection to the peer server that will not be used.
+* clear and cancel request timers on completion or reset, ensuring that they won't be retained way past the point where the request is gone.
+* connection: cancel and discard ping timer before closing (removes timer reference)
+* connection: fix logic where purging-while-resending requests to a coalesced connection was leaving references in the old connection.
+* moved an `on_body_chunk` callback to the `:callbacks` plugin, where it's used and expected to be defined.
+* `http2`: avoid closing the connection on internal errors which are supposed to be specific to a request, such as the max headers or max response body size checks.
+* system resolver will use an internal exception when using `Timeout.timeout` on resolutions to avoid conflicts with the default timeout exception class.
+* prevent edge case where `#alpn_protocol` was being called on a `TCPSocket`.
+* fixed v1.8.0 regression causing connection to loop when an error happens while connecting.
+* resolver cache: fixed cache eviction logic, where alias answers weren't being evicted, causing resolutions to stall after a certain number of resolutions.

data/lib/httpx/adapters/datadog.rb

@@ -185,6 +185,13 @@ module Datadog::Tracing
         end
       end
 
+      # patches httpx debug logs to include datadog correlation ids
+      module LoggablePatch
+        def log_identifiers
+          "#{super} #{Datadog::Tracing.log_correlation}"
+        end
+      end
+
       module Configuration
         # Default settings for httpx
         #
@@ -297,6 +304,8 @@ module Datadog::Tracing
 
           ::HTTPX.send(:remove_const, :Session)
           ::HTTPX.send(:const_set, :Session, datadog_session.class)
+
+          ::HTTPX::Loggable.singleton_class.prepend(LoggablePatch)
         end
       end
 

data/lib/httpx/adapters/faraday.rb

@@ -115,11 +115,11 @@ module Faraday
             ssl_options
           end
         else
-          # :nocov:
+          # simplecov:disable
           def ssl_options_from_env(*)
             {}
           end
-          # :nocov:
+          # simplecov:enable
         end
       end
 

data/lib/httpx/adapters/webmock.rb

@@ -155,6 +155,12 @@ module WebMock
             raise WebMock::NetConnectNotAllowedError, request_signature
           end
         end
+
+        private
+
+        def connect
+          super unless @mocked
+        end
       end
     end
 

data/lib/httpx/connection/http1.rb

@@ -162,18 +162,12 @@ module HTTPX
 
       return unless request
 
-      begin
-        request.log(color: :green) { "-> DATA: #{chunk.bytesize} bytes..." }
-        request.log(level: 2, color: :green) { "-> #{log_redact_body(chunk.inspect)}" }
+      request.log(color: :green) { "-> DATA: #{chunk.bytesize} bytes..." }
+      request.log(level: 2, color: :green) { "-> #{log_redact_body(chunk.inspect)}" }
 
-        response = request.response
+      response = request.response
 
-        response << chunk
-      rescue StandardError => e
-        error_response = ErrorResponse.new(request, e)
-        request.response = error_response
-        dispatch(request)
-      end
+      response << chunk
     end
 
     def on_complete
@@ -416,7 +410,7 @@ module HTTPX
     end
 
     def capitalized(field)
-      UPCASED[field] || field.split("-").map(&:capitalize).join("-")
+      UPCASED.fetch(field) { field.split("-").map(&:capitalize).join("-") }
     end
   end
 end

data/lib/httpx/connection/http2.rb

@@ -37,6 +37,7 @@ module HTTPX
       @streams = {}
       @drains = {}
       @pings = []
+      @streams_to_close_after_receive = []
       @buffer = buffer
       @handshake_completed = false
       @wait_for_handshake = @settings.key?(:wait_for_handshake) ? @settings.delete(:wait_for_handshake) : true
@@ -110,6 +111,12 @@ module HTTPX
 
     def <<(data)
       @connection << data
+
+      while (stream, request, error = @streams_to_close_after_receive.shift)
+        # these streams were marked for cancellation due to errors found while processing the
+        # data received by the peer.
+        emit_stream_error(stream, request, error)
+      end
     end
 
     def send(request, head = false)
@@ -128,7 +135,7 @@ module HTTPX
     rescue ::HTTP2::Error::StreamLimitExceeded
       @pending.unshift(request)
       false
-    rescue StandardError => e
+    rescue ::HTTP2::Error::Error, ArgumentError => e
       emit(:error, request, e)
     end
 
@@ -333,6 +340,8 @@ module HTTPX
       @streams[request] = stream
 
       handle(request, stream) if request.expects?
+    rescue HTTPX::Error => e
+      @streams_to_close_after_receive << [stream, request, e]
     end
 
     def on_stream_trailers(stream, request, response, h)
@@ -345,7 +354,18 @@ module HTTPX
     def on_stream_data(stream, request, data)
       request.log(level: 1, color: :green) { "#{stream.id}: <- DATA: #{data.bytesize} bytes..." }
       request.log(level: 2, color: :green) { "#{stream.id}: <- #{log_redact_body(data.inspect)}" }
+
+      return unless request.response
+
       request.response << data
+    rescue HTTPX::Error => e
+      if stream.state == :closing
+        # there won't be any more chunks to process after this one.
+        emit_stream_error(stream, request, e)
+      else
+        # defer until the last chunk from the payload is processed.
+        @streams_to_close_after_receive << [stream, request, e]
+      end
     end
 
     def on_stream_refuse(stream, request, error)
@@ -381,11 +401,12 @@ module HTTPX
           emit(:response, request, response)
         end
       else
-        response = request.response
-        if response && response.is_a?(Response) && response.status == 421
-          emit(:error, request, :http_1_1_required)
-        else
-          emit(:response, request, response)
+        if (response = request.response)
+          if response.is_a?(Response) && response.status == 421
+            emit(:error, request, :http_1_1_required)
+          else
+            emit(:response, request, response)
+          end
         end
       end
       send(@pending.shift) unless @pending.empty?
@@ -509,6 +530,12 @@ module HTTPX
       emit(:pong)
     end
 
+    def emit_stream_error(stream, request, error)
+      teardown(request)
+      stream.close
+      emit(:error, request, error)
+    end
+
     def teardown(request = nil)
       if request
         @drains.delete(request)

data/lib/httpx/connection.rb

@@ -161,15 +161,17 @@ module HTTPX
     end
 
     def purge_pending(&block)
-      pendings = []
       if @parser
         pending = @parser.pending
         @inflight -= pending.size
-        pendings << pending
+        pending.reject! do |req|
+          block.call(req)
+          true
+        end
       end
-      pendings << @pending
-      pendings.each do |pending|
-        pending.reject!(&block)
+      @pending.reject! do |req|
+        block.call(req)
+        true
       end
     end
 
@@ -203,7 +205,7 @@ module HTTPX
       return @parser.interests if @parser
 
       nil
-    rescue StandardError => e
+    rescue Error => e
       on_error(e)
       nil
     end
@@ -215,6 +217,8 @@ module HTTPX
     def call
       case @state
       when :idle
+        return if no_more_requests?
+
         connect
 
         # when opening the tcp or ssl socket fails
@@ -222,7 +226,7 @@ module HTTPX
 
         consume
       when :closed
-        return if @pending.empty?
+        return if no_more_requests?
 
         # there are pending requests to send, restart the state machine.
         idling
@@ -247,10 +251,14 @@ module HTTPX
         consume
       end
       nil
-    rescue IOError => e
+    rescue Errno::ECONNRESET,
+           Errno::EINVAL,
+           SocketError,
+           IOError,
+           TLSError => e
       @write_buffer.clear
       on_io_error(e)
-    rescue StandardError => e
+    rescue Error => e
       @write_buffer.clear
       on_error(e)
     rescue Exception => e # rubocop:disable Lint/RescueException
@@ -258,6 +266,10 @@ module HTTPX
       raise e
     end
 
+    def initial_call
+      call
+    end
+
     def close
       transition(:active) if @state == :inactive
 
@@ -314,6 +326,11 @@ module HTTPX
       # (example: HTTP/1 parser disabling pipelining)
       return if @state == :idle && @pending.any?
 
+      if @ping_timer
+        @ping_timer.cancel
+        @ping_timer = nil
+      end
+
       parser = @parser
 
       if parser && parser.respond_to?(:max_concurrent_requests)
@@ -433,6 +450,11 @@ module HTTPX
 
     def on_io_error(e)
       on_error(e)
+
+      # do not force close if parser resets the connection.
+      # can happen i.e. when HTTP/1.1 pipelining is disabled.
+      return if @state == :idle && @pending.any?
+
       force_close(true)
     end
 
@@ -456,7 +478,7 @@ module HTTPX
       reset
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "@origin=#{@origin} " \
@@ -464,7 +486,7 @@ module HTTPX
         "@pending=#{@pending.size} " \
         "@io=#{@io}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     private
 
@@ -490,7 +512,7 @@ module HTTPX
           # * the number of pending requests
           # * the number of inflight requests
           # * whether the write buffer has bytes (i.e. for close handshake)
-          if @pending.empty? && @inflight.zero? && @write_buffer.empty?
+          if no_more_requests? && @write_buffer.empty?
             no_more_requests_loop_check if @parser && @parser.pending.any?
 
             # terminate if an altsvc connection has been established
@@ -540,7 +562,7 @@ module HTTPX
             break if @state == :closing || @state == :closed
 
             # exit #consume altogether if all outstanding requests have been dealt with
-            if @pending.empty? && @inflight.zero? && @write_buffer.empty? # rubocop:disable Style/Next
+            if no_more_requests? && @write_buffer.empty? # rubocop:disable Style/Next
               no_more_requests_loop_check if @parser && @parser.pending.any?
 
               # terminate if an altsvc connection has been established
@@ -960,6 +982,7 @@ module HTTPX
       ping_timeout = @options.timeout[:ping_timeout]
 
       @ping_timer = @current_selector.after(ping_timeout) do
+        log(level: 3) { "ping timeout expired..." }
         error = PingTimeoutError.new(ping_timeout, "Timed out after #{ping_timeout} seconds")
         on_error(error)
       end
@@ -986,6 +1009,11 @@ module HTTPX
                    "along with debug logs"
     end
 
+    # true when there are no more pending nor inflight (in parser) requests
+    def no_more_requests?
+      @pending.empty? && @inflight.zero?
+    end
+
     # recover internal state and emit all relevant error responses when +error+ was raised.
     # this takes an optiona +request+ which may have already been handled and can be opted out
     # in the state recovery process.
@@ -1099,13 +1127,14 @@ module HTTPX
         end
 
         timer = selector.after(timeout, callback)
-        request.active_timeouts << label
+        timer.label = label
+        request.active_timeouts << timer
 
         Array(finish_events).each do |event|
           # clean up request timeouts if the connection errors out
           request.set_timeout_callback(event) do
             timer.cancel
-            request.active_timeouts.delete(label)
+            request.active_timeouts.delete(timer)
           end
         end
       end

data/lib/httpx/headers.rb

@@ -140,12 +140,12 @@ module HTTPX
       @headers.to_s
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "#{to_hash.inspect}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     # this is internal API and doesn't abide to other public API
     # guarantees, like downcasing strings.

data/lib/httpx/io/ssl.rb

@@ -20,8 +20,9 @@ module HTTPX
       super
 
       @ssl_session = nil
-      ctx_options = TLS_OPTIONS.merge(options.ssl)
-      @sni_hostname = ctx_options.delete(:hostname) || @hostname
+      ctx_options = TLS_OPTIONS
+      ctx_options = ctx_options.merge(options.ssl) if options.ssl && !options.ssl.empty?
+      @sni_hostname = (ctx_options.delete(:hostname) if ctx_options.key?(:hostname)) || @hostname
 
       if @keep_open && @io.is_a?(OpenSSL::SSL::SSLSocket)
         # externally initiated ssl socket
@@ -29,7 +30,7 @@ module HTTPX
         @state = :negotiated
       else
         @ctx = OpenSSL::SSL::SSLContext.new
-        @ctx.set_params(ctx_options) unless ctx_options.empty?
+        @ctx.set_params(ctx_options)
         unless @ctx.session_cache_mode.nil? # a dummy method on JRuby
           @ctx.session_cache_mode =
             OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT | OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
@@ -51,24 +52,22 @@ module HTTPX
     end
 
     def protocol
-      # @type ivar @io: OpenSSL::SSL::SSLSocket
+      return super unless @io.is_a?(OpenSSL::SSL::SSLSocket)
+
       @io.alpn_protocol || super
-    rescue StandardError
-      super
     end
 
     if RUBY_ENGINE == "jruby"
       # in jruby, alpn_protocol may return ""
       # https://github.com/jruby/jruby-openssl/issues/287
       def protocol
-        # @type ivar @io: OpenSSL::SSL::SSLSocket
+        return super unless @io.is_a?(OpenSSL::SSL::SSLSocket)
+
         proto = @io.alpn_protocol
 
         return super if proto.nil? || proto.empty?
 
         proto
-      rescue StandardError
-        super
       end
     end
 

data/lib/httpx/io/tcp.rb

@@ -182,11 +182,18 @@ module HTTPX
     end
 
     def close
-      return if @keep_open || closed?
+      return if @keep_open
+
+      # mark tcp as closed, so that it can be disconnected.
+      # this bypasses the state machine API as not not allow the transition
+      # from idle to closed in normal circumstances.
+      @state = :closed if @state == :idle
+
+      return if closed?
 
       begin
         @io.close
-      rescue StandardError => e
+      rescue IOError => e
         log { "error closing socket" }
         log { e.full_message(highlight: false) }
       ensure
@@ -212,7 +219,7 @@ module HTTPX
       @state == :idle || @state == :closed
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "#{@ip}:#{@port} " \
@@ -221,7 +228,7 @@ module HTTPX
         "@addresses=#{@addresses} " \
         "@state=#{@state}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     private
 

data/lib/httpx/io/unix.rb

@@ -60,11 +60,11 @@ module HTTPX
       true
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} @path=#{@path}) @state=#{@state})>"
     end
-    # :nocov:
+    # simplecov:enable
 
     private
 

data/lib/httpx/loggable.rb

@@ -17,6 +17,12 @@ module HTTPX
 
     USE_DEBUG_LOG = ENV.key?("HTTPX_DEBUG")
 
+    def self.log_identifiers
+      "pid=#{Process.pid} " \
+        "tid=#{Thread.current.object_id} " \
+        "fid=#{Fiber.current.object_id}"
+    end
+
     def log(
       level: @options.debug_level,
       color: nil,
@@ -36,10 +42,9 @@ module HTTPX
         klass = klass.superclass
       end
 
-      message = +"(time:#{Time.now.utc}, pid:#{Process.pid}, " \
-                 "tid:#{Thread.current.object_id}, " \
-                 "fid:#{Fiber.current.object_id}, " \
-                 "self:#{class_name}##{object_id}) "
+      message = +"(time=#{Time.now.utc} " \
+                 "#{Loggable.log_identifiers} " \
+                 "self=#{class_name}##{object_id}) "
       message << msg.call << "\n"
       message = "\e[#{COLORS[color]}m#{message}\e[0m" if color && debug_stream.respond_to?(:isatty) && debug_stream.isatty
       debug_stream << message
@@ -49,6 +54,8 @@ module HTTPX
       log(level: level, color: color, debug_level: debug_level, debug: debug) { ex.full_message }
     end
 
+    private
+
     def log_redact_headers(text)
       log_redact(text, @options.debug_redact == :headers)
     end

data/lib/httpx/plugins/auth/digest.rb

@@ -24,7 +24,7 @@ module HTTPX
 
         def authenticate(request, authenticate)
           "Digest #{generate_header(request.verb, request.path, authenticate)}"
-        rescue StandardError => e
+        rescue HTTPX::Error => e
           response = ErrorResponse.new(request, e)
           request.response = response
           request.emit_response(response)

data/lib/httpx/plugins/auth.rb

@@ -127,8 +127,8 @@ module HTTPX
           @auth_header_expires_at = if (expires_in = request.options.auth_header_expires_in)
             Time.now.to_i + expires_in
           elsif (expires_at = request.options.auth_header_expires_at)
-            if expires_at.respond_to?(:call)
-              expires_at = expires_at.call(request).to_f
+            if expires_at.respond_to?(:call) && (expires_at = expires_at.call(request))
+              expires_at = expires_at.to_f
               raise Error, "`:auth_header_expires_at` must be positive" unless expires_at.positive?
 
               expires_at
@@ -204,6 +204,15 @@ module HTTPX
             request.unauthorize!
           end
 
+          def when_to_retry(request, response, *)
+            return super unless response.is_a?(Response)
+
+            # retry immediately if authentication no longer valid.
+            return if response.status == 401
+
+            super
+          end
+
           def auth_error?(response, options)
             response.is_a?(Response) && response.status == 401 && dynamic_auth_token?(options.auth_header_value)
           end

data/lib/httpx/plugins/callbacks.rb

@@ -122,6 +122,18 @@ module HTTPX
         end
       end
 
+      module RequestMethods
+        def drain_body
+          super.tap do |chunk|
+            emit(:body_chunk, chunk) if chunk
+          rescue StandardError => e
+            # in case an error occurs in callback code
+            @drain_error = e
+            nil
+          end
+        end
+      end
+
       module ConnectionMethods
         private
 

data/lib/httpx/plugins/digest_auth.rb

@@ -51,9 +51,13 @@ module HTTPX
 
             if probe_response.status == 401 && digest.can_authenticate?(probe_response.headers["www-authenticate"])
               request.transition(:idle)
+
               if (auth_header = digest.authenticate(request, probe_response.headers["www-authenticate"]))
                 request.authorize(auth_header)
               end
+
+              next(request.response) if request.response
+
               super(request)
             else
               probe_response

data/lib/httpx/plugins/fiber_concurrency.rb

@@ -70,6 +70,12 @@ module HTTPX
           )
         end
 
+        def initial_call
+          return unless current_context?
+
+          super
+        end
+
         def interests
           return if connecting? && @pending.none?(&:current_context?)
 
@@ -193,6 +199,12 @@ module HTTPX
       end
 
       module ResolverNativeMethods
+        def initial_call
+          return unless @queries.values.any?(&:current_context?) || @connections.any?(&:current_context?)
+
+          super
+        end
+
         def calculate_interests
           return if @queries.empty?
 
@@ -218,11 +230,23 @@ module HTTPX
       end
 
       module ResolverSystemMethods
+        def initial_call
+          return unless current_context?
+
+          super
+        end
+
         def interests
-          return unless @queries.any? { |_, conn| conn.current_context? }
+          return unless current_context?
 
           super
         end
+
+        private
+
+        def current_context?
+          @queries.any? { |_, conn| conn.current_context? }
+        end
       end
 
       module FiberConcurrencyH2C

data/lib/httpx/plugins/persistent.rb

@@ -55,13 +55,29 @@ module HTTPX
 
         private
 
+        def reconnectable_error?(error)
+          Retries::RECONNECTABLE_ERRORS.any? { |klass| error.is_a?(klass) }
+        end
+
+        def when_to_retry(request, response, *)
+          return super unless response.is_a?(ErrorResponse)
+
+          error = response.error
+          # allow request to be retried immediately if the request failed right after the keep alive timeout.
+          # the chances are, the request failed because the connect has been dropped by the peer server, so it's
+          # fine to reopen.
+          return if request.ping? && reconnectable_error?(error)
+
+          super
+        end
+
         def retryable_request?(request, response, *)
           super || begin
-            return false unless response && response.is_a?(ErrorResponse)
+            return false unless response.is_a?(ErrorResponse)
 
             error = response.error
 
-            Retries::RECONNECTABLE_ERRORS.any? { |klass| error.is_a?(klass) }
+            reconnectable_error?(error)
           end
         end
 

data/lib/httpx/plugins/push_promise.rb

@@ -44,9 +44,9 @@ module HTTPX
 
         def __on_promise_request(parser, stream, h)
           log(level: 1, color: :yellow) do
-            # :nocov:
+            # simplecov:disable
             h.map { |k, v| "#{stream.id}: -> PROMISE HEADER: #{k}: #{v}" }.join("\n")
-            # :nocov:
+            # simplecov:enable
           end
           headers = @options.headers_class.new(h)
           path = headers[":path"]

data/lib/httpx/plugins/ssrf_filter.rb

@@ -149,7 +149,7 @@ module HTTPX
             SsrfFilter.unsafe_ip_address?(ipaddr) || @options.extra_unsafe_ranges&.any? { |r| r.include?(ipaddr) }
           end
 
-          raise ServerSideRequestForgeryError, "#{@origin.host} has no public IP addresses" if addrs.empty?
+          raise ServerSideRequestForgeryError, "#{@origin.host} has no allowed IP addresses" if addrs.empty?
 
           super
         end

data/lib/httpx/plugins/stream.rb

@@ -75,11 +75,11 @@ module HTTPX
       @on_chunk.call(chunk)
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     def to_s
       if @request.response

data/lib/httpx/plugins/stream_bidi.rb

@@ -177,6 +177,8 @@ module HTTPX
           @pipe_read.readpartial(1)
         end
 
+        def initial_call; end
+
         def interests
           return if @closed
 

data/lib/httpx/pool.rb

@@ -173,7 +173,7 @@ module HTTPX
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "@max_connections=#{@max_connections} " \
@@ -181,7 +181,7 @@ module HTTPX
         "@pool_timeout=#{@pool_timeout} " \
         "@connections=#{@connections.size}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     private
 

data/lib/httpx/request/body.rb

@@ -114,12 +114,12 @@ module HTTPX
       @headers.add("transfer-encoding", "chunked")
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "#{unbounded_body? ? "stream" : "@bytesize=#{bytesize}"}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     class << self
       def initialize_body(params)

data/lib/httpx/request.rb

@@ -122,6 +122,7 @@ module HTTPX
 
     def complete!(response = @response)
       emit(:complete, response)
+      reset_timers(true)
     end
 
     # whether request has been buffered with a ping
@@ -268,21 +269,19 @@ module HTTPX
 
     # consumes and returns the next available chunk of request body that can be sent
     def drain_body
-      return nil if @body.nil?
+      return if @body.nil?
 
       @drainer ||= @body.each
-      chunk = @drainer.next.dup
-
-      emit(:body_chunk, chunk)
-      chunk
+      @drainer.next.dup
     rescue StopIteration
       nil
     rescue StandardError => e
+      # in case an error occurs while emitting body chunks
       @drain_error = e
       nil
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "#{@verb} " \
@@ -290,7 +289,7 @@ module HTTPX
         "@headers=#{@headers} " \
         "@body=#{@body}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     # moves on to the +nextstate+ of the request state machine (when all preconditions are met)
     def transition(nextstate)
@@ -299,7 +298,10 @@ module HTTPX
         @body.rewind
         @ping = false
         @response = @drainer = nil
-        @active_timeouts.clear
+
+        # request may be sent to a different connection and will be
+        # reassigned a new set of timers.
+        reset_timers(false)
       when :headers
         return unless @state == :idle
 
@@ -326,7 +328,7 @@ module HTTPX
         return if @state == :expect
 
       end
-      log(level: 3) { "#{@state}] -> #{nextstate}" }
+      log(level: 3) { "#{@state} -> #{nextstate}" }
       @state = nextstate
       emit(@state, self)
       nil
@@ -363,6 +365,19 @@ module HTTPX
 
       @on_response_arrived.call
     end
+
+    private
+
+    def reset_timers(reset_total_request_timers)
+      timers = @active_timeouts
+
+      until (timer = timers.shift).nil?
+        next if !reset_total_request_timers && timer.label == :total_request_timeout
+
+        # cancel active timers.
+        timer.cancel
+      end
+    end
   end
 end
 

data/lib/httpx/resolver/cache/base.rb

@@ -106,14 +106,7 @@ module HTTPX
           name = entry["name"]
           next unless name != hostname
 
-          lookups[name] ||= []
-
-          case family
-          when Socket::AF_INET6
-            lookups[name] << entry
-          when Socket::AF_INET
-            lookups[name].unshift(entry)
-          end
+          _set(name, family, [entry], lookups, hostnames)
         end
       end
 

data/lib/httpx/resolver/https.rb

@@ -126,27 +126,27 @@ module HTTPX
     end
 
     def on_response(request, response)
-      response.raise_for_status
-    rescue StandardError => e
-      hostname = @requests.delete(request)
-      connection = reset_hostname(hostname)
-      emit_resolve_error(connection, connection.peer.host, e)
-      close_or_resolve
-    else
-      # @type var response: HTTPX::Response
-      if response.status.between?(300, 399) && response.headers.key?("location")
-        hostname = @requests[request]
-        connection = @queries[hostname]
-        location_uri = URI(response.headers["location"])
-        location_uri = response.uri.merge(location_uri) if location_uri.relative?
-
-        # we assume that the DNS server URI changed permanently and move on
-        @uri = location_uri
-        send_request(hostname, connection)
-        return
-      end
+      if (e = response.error)
+        hostname = @requests.delete(request)
+        connection = reset_hostname(hostname)
+        emit_resolve_error(connection, connection.peer.host, e)
+        close_or_resolve
+      else
+        # @type var response: HTTPX::Response
+        if response.status.between?(300, 399) && response.headers.key?("location")
+          hostname = @requests[request]
+          connection = @queries[hostname]
+          location_uri = URI(response.headers["location"])
+          location_uri = response.uri.merge(location_uri) if location_uri.relative?
 
-      parse(request, response)
+          # we assume that the DNS server URI changed permanently and move on
+          @uri = location_uri
+          send_request(hostname, connection)
+          return
+        end
+
+        parse(request, response)
+      end
     ensure
       @requests.delete(request)
     end

data/lib/httpx/resolver/native.rb

@@ -75,6 +75,13 @@ module HTTPX
 
     def call
       case @state
+      when :idle, :closed
+        return if @connections.empty?
+
+        transition(:idle) if @state == :closed
+        transition(:open)
+
+        consume if @state == :open
       when :open
         consume
       end

data/lib/httpx/resolver/resolver.rb

@@ -52,6 +52,10 @@ module HTTPX
 
     alias_method :terminate, :close
 
+    def initial_call
+      call
+    end
+
     def force_close(*args)
       while (connection = @connections.shift)
         connection.force_close(*args)

data/lib/httpx/resolver/system.rb

@@ -23,6 +23,9 @@ module HTTPX
     DONE = 1
     ERROR = 2
 
+    class AddrinfoTimeoutError < StandardError
+    end
+
     class << self
       def multi?
         false
@@ -227,7 +230,7 @@ module HTTPX
         begin
           addrs = if resolve_timeout
 
-            Timeout.timeout(resolve_timeout) do
+            Timeout.timeout(resolve_timeout, AddrinfoTimeoutError) do
               __addrinfo_resolve(hostname, scheme)
             end
           else
@@ -246,7 +249,7 @@ module HTTPX
             end
           end
         rescue StandardError => e
-          if e.is_a?(Timeout::Error)
+          if e.is_a?(AddrinfoTimeoutError)
             timeouts.shift
             retry unless timeouts.empty?
             e = ResolveTimeoutError.new(resolve_timeout, e.message)

data/lib/httpx/response/body.rb

@@ -161,13 +161,13 @@ module HTTPX
                end
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "@state=#{@state} " \
         "@length=#{@length}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     # rewinds the response payload buffer.
     def rewind

data/lib/httpx/response.rb

@@ -141,7 +141,7 @@ module HTTPX
       bodyless? || (@request.verb == "CONNECT" && @status == 200)
     end
 
-    # :nocov:
+    # simplecov:disable
     def inspect
       "#<#{self.class}:#{object_id} " \
         "HTTP/#{version} " \
@@ -149,7 +149,7 @@ module HTTPX
         "@headers=#{@headers} " \
         "@body=#{@body.bytesize}>"
     end
-    # :nocov:
+    # simplecov:enable
 
     # returns an instance of HTTPX::HTTPError if the response has a 4xx or 5xx
     # status code, or nothing.
@@ -267,7 +267,6 @@ module HTTPX
   #   response = HTTPX.get("https://some-domain/path") #=> response is HTTPX::Response or HTTPX::ErrorResponse
   #   response.raise_for_status #=> raises if it wraps an error
   class ErrorResponse
-    include Loggable
     extend Forwardable
 
     # the corresponding HTTPX::Request instance.
@@ -290,7 +289,7 @@ module HTTPX
       @response = request.response if request.response.is_a?(Response)
       @error = error
       @options = request.options
-      log_exception(@error)
+      @request.log_exception(@error)
       finish!
     end
 

data/lib/httpx/selector.rb

@@ -41,6 +41,11 @@ module HTTPX
       @selectables.empty? && @timers.empty?
     end
 
+    # first time the registered selectables are added, there's probably work to do.
+    def initial_call
+      @selectables.each(&:initial_call)
+    end
+
     def next_tick
       catch(:jump_tick) do
         timeout = next_timeout

data/lib/httpx/session.rb

@@ -319,9 +319,14 @@ module HTTPX
 
       waiting = false
 
-      responses = requests.each_with_index.map do |request, idx|
+      requests.each do |request|
         send_request(request, selector)
+      end
 
+      # do work first
+      selector.initial_call
+
+      responses = requests.each_with_index.map do |request, idx|
         fetch_response(request, selector, request.options).tap do |response|
           if response.nil?
             pending += 1

data/lib/httpx/session_extensions.rb

@@ -20,11 +20,11 @@ module HTTPX
     $VERBOSE = original_verbosity
   end
 
-  # :nocov:
+  # simplecov:disable
   if Session.default_options.debug_level > 2
     proxy_session = plugin(:internal_telemetry)
     remove_const(:Session)
     const_set(:Session, proxy_session.class)
   end
-  # :nocov:
+  # simplecov:enable
 end

data/lib/httpx/timers.rb

@@ -62,6 +62,9 @@ module HTTPX
     end
 
     class Timer
+      # simpler helper which allows classification
+      attr_accessor :label
+
       def initialize(interval, callback)
         @interval = interval
         @callback = callback

data/lib/httpx/version.rb

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

data/sig/connection/http2.rbs

@@ -16,6 +16,7 @@ module HTTPX
     @max_requests: Integer
     @drains: Hash[Request, String]
     @pings: Array[String]
+    @streams_to_close_after_receive: Array[[HTTP2::Stream, Request, HTTPX::Error]]
     @buffer: Buffer
     @handshake_completed: bool
     @wait_for_handshake: bool
@@ -106,6 +107,8 @@ module HTTPX
 
     def on_pong: (string ping) -> void
 
+    def emit_stream_error: (HTTP2::Stream stream, Request request, StandardError error) -> void
+
     def teardown: (?Request? request) -> void
 
     class Error < ::HTTPX::Error

data/sig/connection.rbs

@@ -92,6 +92,8 @@ module HTTPX
 
     def call: () -> void
 
+    def initial_call: () -> void
+
     def terminate: () -> void
 
     def close: () -> void
@@ -122,7 +124,7 @@ module HTTPX
 
     def on_error: (HTTPX::TimeoutError | Error | StandardError error, ?Request? request) -> void
 
-    def on_io_error: (IOError error) -> void
+    def on_io_error: (SocketError | IOError | TLSError error) -> void
 
     def on_connect_error: (Exception error) -> void
 
@@ -164,6 +166,8 @@ module HTTPX
 
     def no_more_requests_loop_check: () -> void
 
+    def no_more_requests?: () -> bool
+
     def handle_error: (StandardError error, ?Request? request) -> void
 
     def force_purge: () -> void

data/sig/loggable.rbs

@@ -12,10 +12,14 @@ module HTTPX
 
     COLORS: Hash[Symbol, Integer]
 
+    def self.log_identifiers: () -> String
+
     def log: (?level: Integer?, ?color: Symbol?, ?debug_level: Integer, ?debug: _IOLogger?) { () -> String } -> void
 
     def log_exception: (Exception error, ?level: Integer, ?color: Symbol, ?debug_level: Integer, ?debug: _IOLogger?) -> void
 
+    private
+
     def log_redact_headers: (_ToS text) -> String
 
     def log_redact_body: (_ToS text) -> String

data/sig/plugins/auth.rbs

@@ -7,6 +7,10 @@ module HTTPX
         def auth_header_value: () -> auth_header_value_type?
 
         def auth_header_type: () -> String?
+
+        def auth_header_expires_at: () -> (^(Request request) -> _ToF?)?
+
+        def auth_header_expires_in: () -> Float?
       end
 
       module InstanceMethods

data/sig/plugins/persistent.rbs

@@ -6,6 +6,9 @@ module HTTPX
       def self.extra_options: (Options) -> (Options)
 
       module InstanceMethods
+        private
+
+        def reconnectable_error?: (StandardError error) -> bool
       end
     end
 

data/sig/request.rbs

@@ -17,7 +17,7 @@ module HTTPX
     attr_reader response: response?
     attr_reader http2_stream_options: { ?dependency: Integer, ?exclusive: bool, ?weight: Integer }
     attr_reader drain_error: StandardError?
-    attr_reader active_timeouts: Array[Symbol]
+    attr_reader active_timeouts: Array[Timers::Timer]
 
     attr_writer connection: Connection?
     attr_writer on_response_arrived: (^() -> void)?
@@ -93,7 +93,6 @@ module HTTPX
 
     private
 
-    def initialize_body: (Options options) -> Transcoder::_Encoder?
-
+    def reset_timers: (bool reset_total_request_timers) -> void
   end
 end

data/sig/resolver/system.rbs

@@ -5,6 +5,9 @@ module HTTPX
       DONE: 1
       ERROR: 2
 
+      class AddrinfoTimeoutError < StandardError
+      end
+
       @resolver: Resolv::DNS
       @_timeouts: Array[interval]
       @timeouts: Hash[String, Array[interval]]

data/sig/selector.rbs

@@ -6,6 +6,8 @@ module HTTPX
 
     def call: () -> void
 
+    def initial_call: () -> void
+
     def interests: () -> io_interests?
 
     def timeout: () -> interval?

data/sig/timers.rbs

@@ -48,6 +48,8 @@ module HTTPX
       @interval: Interval
       @callback: callback
 
+      attr_accessor label: Symbol?
+
       def initialize: (Interval interval, callback callback) -> void
 
       def cancel: () -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -169,6 +169,7 @@ extra_rdoc_files:
 - doc/release_notes/1_7_7.md
 - doc/release_notes/1_7_8.md
 - doc/release_notes/1_8_0.md
+- doc/release_notes/1_8_1.md
 files:
 - LICENSE.txt
 - README.md
@@ -310,6 +311,7 @@ files:
 - doc/release_notes/1_7_7.md
 - doc/release_notes/1_7_8.md
 - doc/release_notes/1_8_0.md
+- doc/release_notes/1_8_1.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb