httpx 0.22.2 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 373c83e6252fb0439bfe307cacc18514741c9b8eaa1b9d055e1da59015c7a8f3
-  data.tar.gz: bc20567c842a6b6bd7d450fc6edd5ee1eb509940ffddab643a0c6a3b8ad48522
+  metadata.gz: 39a428f7a8a6747513b56a5e2b4216569363b71baa273d1904b3805f6385e1aa
+  data.tar.gz: 900178247910015b23dcc199df570dadde117d3837efecc5b7100e6478054a77
 SHA512:
-  metadata.gz: ff4fd33b7614c410fb30b4916ad430fbf2091d43d6bec5dfa3784564a4824491baa89f33e491db6a4a76c5cf8f4e9e07e2d5192a1214ee0f8283e345b3b1387e
-  data.tar.gz: 4da51a3015ef7a7f32f8e24b7e14324acda8c6a735cd3038e0a7a224376c60775ed533ee936ba58ad51639adcc16906a8ef8b637d9ef84733ac4546ed4ddd7de
+  metadata.gz: 77d450b37b3dacbc998b4a659d2ddfe80ae0fcf38cbbad79a2ab8df10522f0cc69e57979960559503bd9a00eb775b1e664f3ada81d8aaad0a1ae29765ff4868c
+  data.tar.gz: 40d9e2b9cb187f0610d5985128227aedc6ed2c3cde55adcb69e6abd20fd9048d96fb05357e320bdb90442bb3553cacca5aa0368e5455344034d654c902412318

data/README.md

@@ -139,13 +139,13 @@ All Rubies greater or equal to 2.1, and always latest JRuby and Truffleruby.
 **Note**: This gem is tested against all latest patch versions, i.e. if you're using 2.2.0 and you experience some issue, please test it against 2.2.10 (latest patch version of 2.2) before creating an issue.
 
 ## Resources
-|               |                                                     |
-| ------------- | --------------------------------------------------- |
-| Website       | https://os85.gitlab.io/httpx/            |
-| Documentation | https://os85.gitlab.io/httpx/rdoc/       |
-| Wiki          | https://os85.gitlab.io/httpx/wiki/home.html |
-| CI            | https://gitlab.com/os85/httpx/pipelines  |
-| Rubygems      | https://rubygems.org/gems/httpx                     |
+|               |                                                        |
+| ------------- | ------------------------------------------------------ |
+| Website       | https://honeyryderchuck.gitlab.io/httpx/               |
+| Documentation | https://honeyryderchuck.gitlab.io/httpx/rdoc/          |
+| Wiki          | https://honeyryderchuck.gitlab.io/httpx/wiki/home.html |
+| CI            | https://gitlab.com/os85/httpx/pipelines                |
+| Rubygems      | https://rubygems.org/gems/httpx                        |
 
 ## Caveats
 

data/doc/release_notes/0_22_2.md

@@ -1,4 +1,4 @@
-# 0.22.1
+# 0.22.2
 
 ## Chore
 

data/doc/release_notes/0_22_3.md

@@ -0,0 +1,55 @@
+# 0.22.3
+
+## Features
+
+### HTTPX::Response::Body#filename
+
+A new method, `.filename` can be called on response bodies, to get the filename referenced by the server for the received payload (usually in the "Content-Disposition" header).
+
+```ruby
+response = HTTPX.get(url)
+response.raise_for_status
+filename = response.body.filename
+# you can do, for example:
+response.body.copy_to("/home/files/#{filename}")
+```
+
+## Improvements
+
+### Loading integrations by default
+
+Integrations will be loaded by default, as long as the dependency being integrated is already available:
+
+```ruby
+require "ddtrace"
+require "httpx"
+
+HTTPX.get(... # request will be traced via the datadog integration
+```
+
+### Faraday: better error handling
+
+The `faraday` adapter will not raise errors anymore, when used in parallel mode. This fixes the difference in behaviour with the equivalent `typhoeus` parallel adapter, which does not raise errors in such cases as well. This behaviour will exclude 4xx and 5xx HTTP responses, which will not be considered errors in the `faraday` adapter.
+
+If errors occur in parallel mode, these'll be available in `env[:error]`. Users can check it in two ways:
+
+```ruby
+response.status == 0
+# or
+!response.env[:error].nil?
+```
+
+## Bugfixes
+
+* unix socket: handle the error when the path for the unix sock is invalid, which was causing an endless loop.
+
+### IPv6 / Happy eyeballs v2
+
+* the `native` resolver will now use IPv6 nameservers with zone identifier to perform DNS queries. This bug was being ignored prior to ruby 3.1 due to some pre-filtering on the nameservere which were covering misuse of the `uri` dependency for this use case.
+* Happy Eyeballs v2 handshake error on connection establishment for the first IP will now ignore it, in case an ongoing connecting for the second IP is happening. This fixes a case where both IPv4 and IPv6 addresses are served for a given domain, but only one of them can be connected to (i.e. if connection via IPv6 fails, the IPv4 one should still proceed to completion).
+* the `native` resolver won't try querying DNS name candidates, if the resolver sends an empty answer with an error code different from "domain not found".
+* fix error of Happy Eyeballs v2 handshake, where the resulting connection would coalesce with an already open one for the same IP **before** requests were merged to the coalesced connection, resulting in no requests being sent and the client hanging.
+
+## Chore
+
+* fixed error message on wrong type of parameter for the `compression_threshold_size` option from the `:compression` plugin.

data/lib/httpx/adapters/faraday.rb

@@ -210,9 +210,13 @@ module Faraday
         if parallel?(env)
           handler = env[:parallel_manager].enqueue(env)
           handler.on_response do |response|
-            response.raise_for_status
-            save_response(env, response.status, response.body.to_s, response.headers, response.reason) do |response_headers|
-              response_headers.merge!(response.headers)
+            if response.is_a?(::HTTPX::Response)
+              save_response(env, response.status, response.body.to_s, response.headers, response.reason) do |response_headers|
+                response_headers.merge!(response.headers)
+              end
+            else
+              env[:error] = response.error
+              save_response(env, 0, "", {}, nil)
             end
           end
           return handler
@@ -229,6 +233,7 @@ module Faraday
         request.response_on_data = env.request.on_data if env.request.stream_response?
 
         response = session.request(request)
+        # do not call #raise_for_status for HTTP 4xx or 5xx, as faraday has a middleware for that.
         response.raise_for_status unless response.is_a?(::HTTPX::Response)
         save_response(env, response.status, response.body.to_s, response.headers, response.reason) do |response_headers|
           response_headers.merge!(response.headers)

data/lib/httpx/connection/http2.rb

@@ -365,7 +365,7 @@ module HTTPX
         ex.set_backtrace(caller)
         handle_error(ex)
       end
-      return unless is_connection_closed && @streams.size.zero?
+      return unless is_connection_closed && @streams.empty?
 
       emit(:close, is_connection_closed)
     end

data/lib/httpx/connection.rb

@@ -45,10 +45,12 @@ module HTTPX
 
     def_delegator :@write_buffer, :empty?
 
-    attr_reader :io, :origin, :origins, :state, :pending, :options
+    attr_reader :type, :io, :origin, :origins, :state, :pending, :options
 
     attr_writer :timers
 
+    attr_accessor :family
+
     def initialize(type, uri, options)
       @type = type
       @origins = [uri.origin]
@@ -76,13 +78,6 @@ module HTTPX
       self.addresses = @options.addresses if @options.addresses
     end
 
-    def clone_new_connection
-      new_conn = self.class.new(@type, @origin, @options)
-      once(:open, &new_conn.method(:reset))
-      new_conn.once(:open, &method(:close))
-      new_conn
-    end
-
     # this is a semi-private method, to be used by the resolver
     # to initiate the io object.
     def addresses=(addrs)
@@ -121,7 +116,10 @@ module HTTPX
 
       return false unless connection.addresses
 
-      !(@io.addresses & connection.addresses).empty? && @options == connection.options
+      (
+        (open? && @origin == connection.origin) ||
+        !(@io.addresses & connection.addresses).empty?
+      ) && @options == connection.options
     end
 
     # coalescable connections need to be mergeable!
@@ -226,6 +224,14 @@ module HTTPX
       @parser.close if @parser
     end
 
+    # bypasses the state machine to force closing of connections still connecting.
+    # **only** used for Happy Eyeballs v2.
+    def force_reset
+      @state = :closing
+      transition(:closed)
+      emit(:close)
+    end
+
     def reset
       transition(:closing)
       transition(:closed)
@@ -316,7 +322,7 @@ module HTTPX
           # * the number of inflight requests
           # * the number of pending requests
           # * whether the write buffer has bytes (i.e. for close handshake)
-          if @pending.size.zero? && @inflight.zero? && @write_buffer.empty?
+          if @pending.empty? && @inflight.zero? && @write_buffer.empty?
             log(level: 3) { "NO MORE REQUESTS..." }
             return
           end
@@ -360,7 +366,7 @@ module HTTPX
             break if @state == :closing || @state == :closed
 
             # exit #consume altogether if all outstanding requests have been dealt with
-            return if @pending.size.zero? && @inflight.zero?
+            return if @pending.empty? && @inflight.zero?
           end unless ((ints = interests).nil? || ints == :w || @state == :closing) && !epiped
 
           #
@@ -526,11 +532,13 @@ module HTTPX
            Errno::EHOSTUNREACH,
            Errno::EINVAL,
            Errno::ENETUNREACH,
-           Errno::EPIPE => e
+           Errno::EPIPE,
+           Errno::ENOENT,
+           SocketError => e
       # connect errors, exit gracefully
       error = ConnectionError.new(e.message)
       error.set_backtrace(e.backtrace)
-      handle_error(error)
+      connecting? && callbacks(:connect_error).any? ? emit(:connect_error, error) : handle_error(error)
       @state = :closed
       emit(:close)
     rescue TLSError => e
@@ -549,6 +557,8 @@ module HTTPX
         return if @state == :closed
 
         @io.connect
+        emit(:tcp_open, self) if @io.state == :connected
+
         return unless @io.connected?
 
         @connected_at = Utils.now

data/lib/httpx/extensions.rb

@@ -160,6 +160,7 @@ module HTTPX
   module URIExtensions
     # uri 0.11 backport, ships with ruby 3.1
     refine URI::Generic do
+
       def non_ascii_hostname
         @non_ascii_hostname
       end

data/lib/httpx/io/tcp.rb

@@ -76,11 +76,7 @@ module HTTPX
            Errno::EADDRNOTAVAIL,
            Errno::EHOSTUNREACH,
            SocketError => e
-      if @ip_index <= 0
-        error = ConnectionError.new(e.message)
-        error.set_backtrace(e.backtrace)
-        raise error
-      end
+      raise e if @ip_index <= 0
 
       log { "failed connecting to #{@ip} (#{e.message}), trying next..." }
       @ip_index -= 1

data/lib/httpx/io/udp.rb

@@ -6,11 +6,10 @@ module HTTPX
   class UDP
     include Loggable
 
-    def initialize(uri, _, options)
-      ip = IPAddr.new(uri.host)
-      @host = ip.to_s
-      @port = uri.port
-      @io = UDPSocket.new(ip.family)
+    def initialize(ip, port, options)
+      @host = ip
+      @port = port
+      @io = UDPSocket.new(IPAddr.new(ip).family)
       @options = options
     end
 

data/lib/httpx/options.rb

@@ -15,7 +15,7 @@ module HTTPX
     # https://github.com/ruby/resolv/blob/095f1c003f6073730500f02acbdbc55f83d70987/lib/resolv.rb#L408
     ip_address_families = begin
       list = Socket.ip_address_list
-      if list.any? { |a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? }
+      if list.any? { |a| a.ipv6? && !a.ipv6_loopback? && !a.ipv6_linklocal? && !a.ipv6_unique_local? }
         [Socket::AF_INET6, Socket::AF_INET]
       else
         [Socket::AF_INET]
@@ -100,7 +100,7 @@ module HTTPX
       end
 
       def def_option(optname, *args, &block)
-        if args.size.zero? && !block
+        if args.empty? && !block
           class_eval(<<-OUT, __FILE__, __LINE__ + 1)
             def option_#{optname}(v); v; end # def option_smth(v); v; end
           OUT

data/lib/httpx/plugins/compression/gzip.rb

@@ -56,7 +56,7 @@ module HTTPX
 
         class Inflater
           def initialize(bytesize)
-            @inflater = Zlib::Inflate.new(32 + Zlib::MAX_WBITS)
+            @inflater = Zlib::Inflate.new(Zlib::MAX_WBITS + 32)
             @bytesize = bytesize
             @buffer = nil
           end

data/lib/httpx/plugins/compression.rb

@@ -30,7 +30,7 @@ module HTTPX
       module OptionsMethods
         def option_compression_threshold_size(value)
           bytes = Integer(value)
-          raise TypeError, ":expect_threshold_size must be positive" unless bytes.positive?
+          raise TypeError, ":compression_threshold_size must be positive" unless bytes.positive?
 
           bytes
         end
@@ -138,7 +138,7 @@ module HTTPX
         def each(&blk)
           return enum_for(__method__) unless blk
 
-          return deflate(&blk) if @buffer.size.zero?
+          return deflate(&blk) if @buffer.size.zero? # rubocop:disable Style/ZeroLengthPredicate
 
           @buffer.rewind
           @buffer.each(&blk)
@@ -152,7 +152,7 @@ module HTTPX
         private
 
         def deflate(&blk)
-          return unless @buffer.size.zero?
+          return unless @buffer.size.zero? # rubocop:disable Style/ZeroLengthPredicate
 
           @body.rewind
           @deflater.deflate(@body, @buffer, chunk_size: 16_384, &blk)

data/lib/httpx/plugins/grpc/message.rb

@@ -57,7 +57,7 @@ module HTTPX
 
             yield data
 
-            message = message.byteslice((5 + size)..-1)
+            message = message.byteslice((size + 5)..-1)
           end
         end
 

data/lib/httpx/plugins/multipart/decoder.rb

@@ -5,10 +5,6 @@ require "delegate"
 
 module HTTPX::Plugins
   module Multipart
-    using HTTPX::RegexpExtensions unless Regexp.method_defined?(:match?)
-
-    CRLF = "\r\n"
-
     class FilePart < SimpleDelegator
       attr_reader :original_filename, :content_type
 
@@ -20,32 +16,14 @@ module HTTPX::Plugins
       end
     end
 
-    TOKEN = %r{[^\s()<>,;:\\"/\[\]?=]+}.freeze
-    VALUE = /"(?:\\"|[^"])*"|#{TOKEN}/.freeze
-    CONDISP = /Content-Disposition:\s*#{TOKEN}\s*/i.freeze
-    BROKEN_QUOTED = /^#{CONDISP}.*;\s*filename="(.*?)"(?:\s*$|\s*;\s*#{TOKEN}=)/i.freeze
-    BROKEN_UNQUOTED = /^#{CONDISP}.*;\s*filename=(#{TOKEN})/i.freeze
-    MULTIPART_CONTENT_TYPE = /Content-Type: (.*)#{CRLF}/ni.freeze
-    MULTIPART_CONTENT_DISPOSITION = /Content-Disposition:.*;\s*name=(#{VALUE})/ni.freeze
-    MULTIPART_CONTENT_ID = /Content-ID:\s*([^#{CRLF}]*)/ni.freeze
-    # Updated definitions from RFC 2231
-    ATTRIBUTE_CHAR = %r{[^ \t\v\n\r)(><@,;:\\"/\[\]?='*%]}.freeze
-    ATTRIBUTE = /#{ATTRIBUTE_CHAR}+/.freeze
-    SECTION = /\*[0-9]+/.freeze
-    REGULAR_PARAMETER_NAME = /#{ATTRIBUTE}#{SECTION}?/.freeze
-    REGULAR_PARAMETER = /(#{REGULAR_PARAMETER_NAME})=(#{VALUE})/.freeze
-    EXTENDED_OTHER_NAME = /#{ATTRIBUTE}\*[1-9][0-9]*\*/.freeze
-    EXTENDED_OTHER_VALUE = /%[0-9a-fA-F]{2}|#{ATTRIBUTE_CHAR}/.freeze
-    EXTENDED_OTHER_PARAMETER = /(#{EXTENDED_OTHER_NAME})=(#{EXTENDED_OTHER_VALUE}*)/.freeze
-    EXTENDED_INITIAL_NAME = /#{ATTRIBUTE}(?:\*0)?\*/.freeze
-    EXTENDED_INITIAL_VALUE = /[a-zA-Z0-9-]*'[a-zA-Z0-9-]*'#{EXTENDED_OTHER_VALUE}*/.freeze
-    EXTENDED_INITIAL_PARAMETER = /(#{EXTENDED_INITIAL_NAME})=(#{EXTENDED_INITIAL_VALUE})/.freeze
-    EXTENDED_PARAMETER = /#{EXTENDED_INITIAL_PARAMETER}|#{EXTENDED_OTHER_PARAMETER}/.freeze
-    DISPPARM = /;\s*(?:#{REGULAR_PARAMETER}|#{EXTENDED_PARAMETER})\s*/.freeze
-    RFC2183 = /^#{CONDISP}(#{DISPPARM})+$/i.freeze
-
     class Decoder
+      include HTTPX::Utils
+
+      CRLF = "\r\n"
       BOUNDARY_RE = /;\s*boundary=([^;]+)/i.freeze
+      MULTIPART_CONTENT_TYPE = /Content-Type: (.*)#{CRLF}/ni.freeze
+      MULTIPART_CONTENT_DISPOSITION = /Content-Disposition:.*;\s*name=(#{VALUE})/ni.freeze
+      MULTIPART_CONTENT_ID = /Content-ID:\s*([^#{CRLF}]*)/ni.freeze
       WINDOW_SIZE = 2 << 14
 
       def initialize(response)
@@ -102,7 +80,7 @@ module HTTPX::Plugins
             name = head[MULTIPART_CONTENT_ID, 1]
           end
 
-          filename = get_filename(head)
+          filename = HTTPX::Utils.get_filename(head)
 
           name = filename || +"#{content_type || "text/plain"}[]" if name.nil? || name.empty?
 
@@ -154,34 +132,6 @@ module HTTPX::Plugins
           raise Error, "parsing should have been over by now"
         end until @buffer.empty?
       end
-
-      def get_filename(head)
-        filename = nil
-        case head
-        when RFC2183
-          params = Hash[*head.scan(DISPPARM).flat_map(&:compact)]
-
-          if (filename = params["filename"])
-            filename = Regexp.last_match(1) if filename =~ /^"(.*)"$/
-          elsif (filename = params["filename*"])
-            encoding, _, filename = filename.split("'", 3)
-          end
-        when BROKEN_QUOTED, BROKEN_UNQUOTED
-          filename = Regexp.last_match(1)
-        end
-
-        return unless filename
-
-        filename = URI::DEFAULT_PARSER.unescape(filename) if filename.scan(/%.?.?/).all? { |s| /%[0-9a-fA-F]{2}/.match?(s) }
-
-        filename.scrub!
-
-        filename = filename.gsub(/\\(.)/, '\1') unless /\\[^\\"]/.match?(filename)
-
-        filename.force_encoding ::Encoding.find(encoding) if encoding
-
-        filename
-      end
     end
   end
 end

data/lib/httpx/plugins/retries.rb

@@ -26,7 +26,7 @@ module HTTPX
         ConnectionError,
         Connection::HTTP2::GoawayError,
       ].freeze
-      DEFAULT_JITTER = ->(interval) { interval * (0.5 * (1 + rand)) }
+      DEFAULT_JITTER = ->(interval) { interval * ((rand + 1) * 0.5) }
 
       if ENV.key?("HTTPX_NO_JITTER")
         def self.extra_options(options)

data/lib/httpx/pool.rb

@@ -72,7 +72,7 @@ module HTTPX
     end
 
     def init_connection(connection, _options)
-      resolve_connection(connection)
+      resolve_connection(connection) unless connection.family
       connection.timers = @timers
       connection.on(:open) do
         @connected_connections += 1
@@ -116,18 +116,53 @@ module HTTPX
         #    resolve a name (not the same as name being an IP, yet)
         # 2. when the connection is initialized with an external already open IO.
         #
+        connection.once(:connect_error, &connection.method(:handle_error))
         on_resolver_connection(connection)
         return
       end
 
       find_resolver_for(connection) do |resolver|
-        resolver << connection
+        resolver << try_clone_connection(connection, resolver.family)
         next if resolver.empty?
 
         select_connection(resolver)
       end
     end
 
+    def try_clone_connection(connection, family)
+      connection.family ||= family
+
+      return connection if connection.family == family
+
+      new_connection = connection.class.new(connection.type, connection.origin, connection.options)
+      new_connection.family = family
+
+      connection.once(:tcp_open) { new_connection.force_reset }
+      connection.once(:connect_error) do |err|
+        if new_connection.connecting?
+          new_connection.merge(connection)
+        else
+          connection.handle_error(err)
+        end
+      end
+
+      new_connection.once(:tcp_open) do |new_conn|
+        new_conn.merge(connection)
+        connection.force_reset
+      end
+      new_connection.once(:connect_error) do |err|
+        if connection.connecting?
+          # main connection has the requests
+          connection.merge(new_connection)
+        else
+          new_connection.handle_error(err)
+        end
+      end
+
+      init_connection(new_connection, connection.options)
+      new_connection
+    end
+
     def on_resolver_connection(connection)
       @connections << connection unless @connections.include?(connection)
       found_connection = @connections.find do |ch|
@@ -187,6 +222,7 @@ module HTTPX
     def coalesce_connections(conn1, conn2)
       return register_connection(conn2) unless conn1.coalescable?(conn2)
 
+      conn2.emit(:tcp_open, conn1)
       conn1.merge(conn2)
       @connections.delete(conn2)
     end

data/lib/httpx/resolver/https.rb

@@ -136,9 +136,22 @@ module HTTPX
         emit_resolve_error(connection, connection.origin.host, e)
         return
       end
-      if answers.nil? || answers.empty?
+
+      if answers.nil?
+        # Indicates no such domain was found.
+
         host = @requests.delete(request)
         connection = @queries.delete(host)
+
+        emit_resolve_error(connection) unless @queries.value?(connection)
+      elsif answers.empty?
+        # no address found, eliminate candidates
+        host = @requests.delete(request)
+        connection = @queries.delete(host)
+
+        # eliminate other candidates
+        @queries.delete_if { |_, conn| connection == conn }
+
         emit_resolve_error(connection)
         return
 

data/lib/httpx/resolver/native.rb

@@ -21,21 +21,7 @@ module HTTPX
         packet_size: 512,
         timeouts: Resolver::RESOLVE_TIMEOUT,
       }
-    end
-
-    # nameservers for ipv6 are misconfigured in certain systems;
-    # this can use an unexpected endless loop
-    # https://gitlab.com/honeyryderchuck/httpx/issues/56
-    DEFAULTS[:nameserver].select! do |nameserver|
-      begin
-        IPAddr.new(nameserver)
-        true
-      rescue IPAddr::InvalidAddressError
-        false
-      end
-    end if DEFAULTS[:nameserver]
-
-    DEFAULTS.freeze
+    end.freeze
 
     DNS_PORT = 53
 
@@ -215,7 +201,8 @@ module HTTPX
         raise ex
       end
 
-      if addresses.nil? || addresses.empty?
+      if addresses.nil?
+        # Indicates no such domain was found.
         hostname, connection = @queries.first
         @queries.delete(hostname)
         @timeouts.delete(hostname)
@@ -224,6 +211,14 @@ module HTTPX
           @connections.delete(connection)
           raise NativeResolveError.new(connection, connection.origin.host)
         end
+      elsif addresses.empty?
+        # no address found, eliminate candidates
+        _, connection = @queries.first
+        candidates = @queries.select { |_, conn| connection == conn }.keys
+        @queries.delete_if { |hs, _| candidates.include?(hs) }
+        @timeouts.delete_if { |hs, _| candidates.include?(hs) }
+        @connections.delete(connection)
+        raise NativeResolveError.new(connection, connection.origin.host)
       else
         address = addresses.first
         name = address["name"]
@@ -309,11 +304,8 @@ module HTTPX
 
       ip, port = @nameserver[@ns_index]
       port ||= DNS_PORT
-      uri = URI::Generic.build(scheme: "udp", port: port)
-      uri.hostname = ip
-      type = IO.registry(uri.scheme)
-      log { "resolver: server: #{uri}..." }
-      @io = type.new(uri, [IPAddr.new(ip)], @options)
+      log { "resolver: server: #{ip}:#{port}..." }
+      @io = UDP.new(ip, port, @options)
     end
 
     def transition(nextstate)

data/lib/httpx/resolver/resolver.rb

@@ -54,7 +54,7 @@ module HTTPX
       # double emission check
       return if connection.addresses && !addresses.intersect?(connection.addresses)
 
-      log { "resolver: answer #{connection.origin.host}: #{addresses.inspect}" }
+      log { "resolver: answer #{FAMILY_TYPES[RECORD_TYPES[family]]} #{connection.origin.host}: #{addresses.inspect}" }
       if @pool && # if triggered by early resolve, pool may not be here yet
          !connection.io &&
          connection.options.ip_families.size > 1 &&
@@ -73,11 +73,6 @@ module HTTPX
     private
 
     def emit_resolved_connection(connection, addresses)
-      if connection.io && connection.connecting? && @pool
-        new_connection = connection.clone_new_connection
-        @pool.init_connection(new_connection, connection.options)
-        connection = new_connection
-      end
       connection.addresses = addresses
 
       emit(:resolve, connection)

data/lib/httpx/resolver.rb

@@ -108,7 +108,15 @@ module HTTPX
 
     def decode_dns_answer(payload)
       message = Resolv::DNS::Message.decode(payload)
+
+      # no domain was found
+      return if message.rcode == Resolv::DNS::RCode::NXDomain
+
       addresses = []
+
+      # TODO: raise an "other dns OtherResolvError" type of error
+      return addresses if message.rcode != Resolv::DNS::RCode::NoError
+
       message.each_answer do |question, _, value|
         case value
         when Resolv::DNS::Resource::IN::CNAME

data/lib/httpx/response.rb

@@ -181,6 +181,12 @@ module HTTPX
         end
       end
 
+      def filename
+        return unless @headers.key?("content-disposition")
+
+        Utils.get_filename(@headers["content-disposition"])
+      end
+
       def to_s
         case @buffer
         when StringIO

data/lib/httpx/utils.rb

@@ -3,6 +3,12 @@
 module HTTPX
   module Utils
     using URIExtensions
+    using HTTPX::RegexpExtensions unless Regexp.method_defined?(:match?)
+
+    TOKEN = %r{[^\s()<>,;:\\"/\[\]?=]+}.freeze
+    VALUE = /"(?:\\"|[^"])*"|#{TOKEN}/.freeze
+    FILENAME_REGEX = /\s*filename=(#{VALUE})/.freeze
+    FILENAME_EXTENSION_REGEX = /\s*filename\*=(#{VALUE})/.freeze
 
     module_function
 
@@ -25,6 +31,30 @@ module HTTPX
       time - Time.now
     end
 
+    def get_filename(header, _prefix_regex = nil)
+      filename = nil
+      case header
+      when FILENAME_REGEX
+        filename = Regexp.last_match(1)
+        filename = Regexp.last_match(1) if filename =~ /^"(.*)"$/
+      when FILENAME_EXTENSION_REGEX
+        filename = Regexp.last_match(1)
+        encoding, _, filename = filename.split("'", 3)
+      end
+
+      return unless filename
+
+      filename = URI::DEFAULT_PARSER.unescape(filename) if filename.scan(/%.?.?/).all? { |s| /%[0-9a-fA-F]{2}/.match?(s) }
+
+      filename.scrub!
+
+      filename = filename.gsub(/\\(.)/, '\1') unless /\\[^\\"]/.match?(filename)
+
+      filename.force_encoding ::Encoding.find(encoding) if encoding
+
+      filename
+    end
+
     if RUBY_VERSION < "2.3"
 
       def to_uri(uri)

data/lib/httpx/version.rb

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

data/lib/httpx.rb

@@ -67,3 +67,9 @@ end
 
 require "httpx/session"
 require "httpx/session_extensions"
+
+# load integrations when possible
+
+require "httpx/adapters/datadog" if defined?(DDTrace) || defined?(Datadog)
+require "httpx/adapters/sentry" if defined?(Sentry)
+require "httpx/adapters/webmock" if defined?(WebMock)

data/sig/connection.rbs

@@ -21,6 +21,7 @@ module HTTPX
 
     BUFFER_SIZE: Integer
 
+    attr_reader type: io_type
     attr_reader origin: URI::Generic
     attr_reader origins: Array[String]
     attr_reader state: Symbol
@@ -28,7 +29,8 @@ module HTTPX
     attr_reader options: Options
     attr_writer timers: Timers
 
-    @type: io_type
+    attr_accessor family: Integer?
+
     @window_size: Integer
     @read_buffer: Buffer
     @write_buffer: Buffer
@@ -36,8 +38,6 @@ module HTTPX
     @keep_alive_timeout: Numeric?
     @total_timeout: Numeric?
 
-    def clone_new_connection: () -> instance
-
     def addresses: () -> Array[ipaddr]?
 
     def addresses=: (Array[ipaddr]) -> void

data/sig/plugins/multipart.rbs

@@ -68,8 +68,6 @@ module HTTPX
         def initialize: (Response response) -> void
 
         def parse: () -> void
-
-        def get_filename: (String head) -> String?
       end
 
       class FilePart #  < SimpleDelegator

data/sig/pool.rbs

@@ -22,7 +22,9 @@ module HTTPX
 
     private
 
-    def initialize: () -> untyped
+    def initialize: () -> void
+
+    def try_clone_connection: (Connection connection, Integer? family) -> Connection
 
     def resolve_connection: (Connection) -> void
 

data/sig/resolver/https.rbs

@@ -6,7 +6,8 @@ module HTTPX
       DEFAULTS: Hash[Symbol, untyped]
       FAMILY_TYPES: Hash[singleton(Resolv::DNS::Resource), String]
 
-      @family: ip_family
+      attr_reader family: ip_family
+
       @options: Options
       @requests: Hash[Request, String]
       @connections: Array[Connection]
@@ -33,7 +34,7 @@ module HTTPX
 
       def build_request: (String hostname) -> Request
 
-      def decode_response_body: (Response) -> Array[dns_result]
+      def decode_response_body: (Response) -> Array[dns_result]?
     end
   end
 end

data/sig/resolver/native.rbs

@@ -7,7 +7,8 @@ module HTTPX
       DEFAULTS: Hash[Symbol, untyped]
       DNS_PORT: Integer
 
-      @family: ip_family
+      attr_reader family: ip_family
+
       @options: Options
       @ns_index: Integer
       @nameserver: Array[String]?

data/sig/resolver/resolver.rbs

@@ -6,7 +6,7 @@ module HTTPX
 
       RECORD_TYPES: Hash[Integer, singleton(Resolv::DNS::Resource)]
 
-      attr_reader family: ip_family
+      attr_reader family: ip_family?
 
       @record_type: singleton(Resolv::DNS::Resource)
       @options: Options
@@ -24,6 +24,8 @@ module HTTPX
 
       private
 
+      def emit_resolved_connection: (Connection connection, Array[IPAddr] addresses) -> void
+
       def initialize: (ip_family? family, options options) -> void
 
       def early_resolve: (Connection connection, ?hostname: String) -> void

data/sig/resolver.rbs

@@ -30,6 +30,6 @@ module HTTPX
 
     def self?.encode_dns_query: (String hostname, ?type: dns_resource) -> String
 
-    def self?.decode_dns_answer: (String) -> Array[dns_result]
+    def self?.decode_dns_answer: (String) -> Array[dns_result]?
   end
 end

data/sig/response.rbs

@@ -64,6 +64,8 @@ module HTTPX
       def each: () { (String) -> void } -> void
               | () -> Enumerable[String]
 
+      def filename: () -> String?
+
       def bytesize: () -> (Integer | Float)
       def empty?: () -> bool
       def copy_to: (String | File | _Writer destination) -> void

data/sig/utils.rbs

@@ -9,5 +9,7 @@ module HTTPX
     def self?.elapsed_time: (Integer | Float monotonic_time) -> Float
 
     def self?.to_uri: (generic_uri uri) -> URI::Generic
+
+    def self?.get_filename: (String header) -> String?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.22.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -91,6 +91,7 @@ extra_rdoc_files:
 - doc/release_notes/0_22_0.md
 - doc/release_notes/0_22_1.md
 - doc/release_notes/0_22_2.md
+- doc/release_notes/0_22_3.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md
@@ -174,6 +175,7 @@ files:
 - doc/release_notes/0_22_0.md
 - doc/release_notes/0_22_1.md
 - doc/release_notes/0_22_2.md
+- doc/release_notes/0_22_3.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md