httpx 0.20.0 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a31aeffa012bd1eea19c1e892c8669624de0d21c9cd8911ae025375f0b93fb
-  data.tar.gz: 285707682eb2d1451106d28bc2d4a8ceb247d4237139c9e7d83bd5a0163b5a5c
+  metadata.gz: 543163347ad58a18829298d36113f88da710c5b139c14968962cdd88d9d36c86
+  data.tar.gz: 1a460e4e2f079f6b08ede7ad7076039ead2b6fc31cffb590e4c245d38e838dc5
 SHA512:
-  metadata.gz: 6f2c50aa8895c6f07ed0acbca1b1171343da2b55bc838ae7f2a0f7a44300c101ea0020938946bf630b80ad6b81bed3cb54910b0734576b6e7c000e058497128c
-  data.tar.gz: 83e19a86d841056821d9198c9a8e3e7b06ec354445289a1fd7d612d070b02b0a01aa9f45f5acdb0b35e4da413c2c3955646e5f55c5421db95879092a0a3aa377
+  metadata.gz: 7bf4ccdbefc71b868b51ff130cb0892791935dade7829ffe09b3401dbba112fd354a8781da8d58015afb254206ac8a5187477ac65bdaf09b996909ef2e42f93c
+  data.tar.gz: a06649e2a51aebe113e3604e739916f164a30aa643eb7e2a5f82871929d2ce1c9bb8b9f234c2ac2ce07f3bd995058e8ba7f1b42e5eaf5cb63fe205b753184b0b

data/doc/release_notes/0_19_8.md

@@ -1,4 +1,4 @@
-# 0.19.7
+# 0.19.8
 
 ## Bugfixes
 

data/doc/release_notes/0_20_0.md

@@ -1,4 +1,4 @@
-# 0.19.0
+# 0.20.0
 
 ## Features
 

data/doc/release_notes/0_20_1.md

@@ -0,0 +1,5 @@
+# 0.20.1
+
+## Bugfixes
+
+* bugfix for unregistering connections when timing out on DNS resolving; this wasn't happening, leaving a few cases where requests to the same domain timing out on resolution would hang on the second request.

data/doc/release_notes/0_20_2.md

@@ -0,0 +1,7 @@
+# 0.20.2
+
+## Bugfixes
+
+* fix for selector timeout errors closing all connections and ignoring resolvers.
+
+Timeout errors on select were being propagated to all pooled connections, although not all of them were being selected on, and not all of them having timed out. plus, resolver timeouts were doing the same, making connections fail with connection timeout error, rather than resolve timeout error. A patch was implemented, where the selector now yields an error to the selected connections, rather than plain raising exception.

data/doc/release_notes/0_20_3.md

@@ -0,0 +1,6 @@
+# 0.20.3
+
+## Bugfixes
+
+* DoH resolver wasn't working for non-absolute (the large majority) of domains since v0.19.
+* Allowing a single IP string to be passed to the resolver option `:nameserver` (just like the `resolv` library does), besides the already supported list of IPs.

data/lib/httpx/connection.rb

@@ -276,6 +276,12 @@ module HTTPX
       @state == :open || @state == :inactive
     end
 
+    def raise_timeout_error(interval)
+      error = HTTPX::TimeoutError.new(interval, "timed out while waiting on select")
+      error.set_backtrace(caller)
+      on_error(error)
+    end
+
     private
 
     def connect

data/lib/httpx/io/ssl.rb

@@ -145,12 +145,12 @@ module HTTPX
       "#{super}\n\n" \
         "SSL connection using #{@io.ssl_version} / #{Array(@io.cipher).first}\n" \
         "ALPN, server accepted to use #{protocol}\n" \
-        "Server certificate:\n" \
-        " subject: #{server_cert.subject}\n" \
-        " start date: #{server_cert.not_before}\n" \
-        " expire date: #{server_cert.not_after}\n" \
-        " issuer: #{server_cert.issuer}\n" \
-        " SSL certificate verify ok."
+        "Server certificate:\n " \
+        "subject: #{server_cert.subject}\n " \
+        "start date: #{server_cert.not_before}\n " \
+        "expire date: #{server_cert.not_after}\n " \
+        "issuer: #{server_cert.issuer}\n " \
+        "SSL certificate verify ok."
     end
   end
 end

data/lib/httpx/pool.rb

@@ -80,6 +80,9 @@ module HTTPX
       connection.on(:activate) do
         select_connection(connection)
       end
+      connection.on(:close) do
+        unregister_connection(connection)
+      end
     end
 
     def deactivate(connections)
@@ -143,8 +146,6 @@ module HTTPX
 
     def on_resolver_error(connection, error)
       connection.emit(:error, error)
-      # must remove connection by hand, hasn't been started yet
-      unregister_connection(connection)
     end
 
     def on_resolver_close(resolver)
@@ -171,8 +172,7 @@ module HTTPX
 
     def unregister_connection(connection)
       @connections.delete(connection)
-      deselect_connection(connection)
-      @connected_connections -= 1
+      @connected_connections -= 1 if deselect_connection(connection)
     end
 
     def select_connection(connection)

data/lib/httpx/resolver/https.rb

@@ -39,6 +39,7 @@ module HTTPX
       @uri_addresses = nil
       @resolver = Resolv::DNS.new
       @resolver.timeouts = @resolver_options.fetch(:timeouts, Resolver::RESOLVE_TIMEOUT)
+      @resolver.lazy_initialize
     end
 
     def <<(connection)

data/lib/httpx/resolver/native.rb

@@ -45,7 +45,7 @@ module HTTPX
       super
       @ns_index = 0
       @resolver_options = DEFAULTS.merge(@options.resolver_options)
-      @nameserver = @resolver_options[:nameserver]
+      @nameserver = Array(@resolver_options[:nameserver]) if @resolver_options[:nameserver]
       @ndots = @resolver_options[:ndots]
       @search = Array(@resolver_options[:search]).map { |srch| srch.scan(/[^.]+/) }
       @_timeouts = Array(@resolver_options[:timeouts])
@@ -118,6 +118,10 @@ module HTTPX
       @timeouts.values_at(*hosts).reject(&:empty?).map(&:first).min
     end
 
+    def raise_timeout_error(interval)
+      do_retry(interval)
+    end
+
     private
 
     def calculate_interests
@@ -134,10 +138,10 @@ module HTTPX
       dwrite if calculate_interests == :w
     end
 
-    def do_retry
+    def do_retry(loop_time = nil)
       return if @queries.empty? || !@start_timeout
 
-      loop_time = Utils.elapsed_time(@start_timeout)
+      loop_time ||= Utils.elapsed_time(@start_timeout)
 
       query = @queries.first
 

data/lib/httpx/response.rb

@@ -56,7 +56,7 @@ module HTTPX
 
     # :nocov:
     def inspect
-      "#<Response:#{object_id} "\
+      "#<Response:#{object_id} " \
         "HTTP/#{version} " \
         "@status=#{@status} " \
         "@headers=#{@headers} " \

data/lib/httpx/selector.rb

@@ -74,7 +74,10 @@ class HTTPX::Selector
 
       readers, writers = IO.select(r, w, nil, interval)
 
-      raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select") if readers.nil? && writers.nil? && interval
+      if readers.nil? && writers.nil? && interval
+        [*r, *w].each { |io| io.raise_timeout_error(interval) }
+        return
+      end
     rescue IOError, SystemCallError
       @selectables.reject!(&:closed?)
       retry
@@ -108,7 +111,11 @@ class HTTPX::Selector
              when nil then return
     end
 
-    raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select") unless result || interval.nil?
+    unless result || interval.nil?
+      io.raise_timeout_error(interval)
+      return
+    end
+    # raise HTTPX::TimeoutError.new(interval, "timed out while waiting on select")
 
     yield io
   rescue IOError, SystemCallError

data/lib/httpx/version.rb

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

data/sig/connection.rbs

@@ -72,6 +72,9 @@ module HTTPX
     def timeout: () -> Numeric?
 
     def deactivate: () -> void
+
+    def raise_timeout_error: (Numeric interval) -> void
+
     private
 
     def initialize: (String, URI::Generic, options) -> untyped

data/sig/pool.rbs

@@ -36,9 +36,9 @@ module HTTPX
 
     def unregister_connection: (Connection) -> void
 
-    def select_connection: (Resolver::Resolver | Connection connection) -> void
+    def select_connection: (Selector::selectable) -> void
 
-    def deselect_connection: (Resolver::Resolver | Connection connection) -> void
+    def deselect_connection: (Selector::selectable) -> Selector::selectable?
 
     def coalesce_connections: (Connection coalescable, Connection coalescing) -> void
 

data/sig/resolver/native.rbs

@@ -27,6 +27,8 @@ module HTTPX
 
       def timeout: () -> Numeric?
 
+      def raise_timeout_error: (Numeric interval) -> void
+
       private
 
       def initialize: (ip_family family, options options) -> void
@@ -35,7 +37,7 @@ module HTTPX
 
       def consume: () -> void
 
-      def do_retry: () -> void
+      def do_retry: (?Numeric loop_time) -> void
 
       def dread: (Integer) -> void
                | () -> void

data/sig/selector.rbs

@@ -7,7 +7,7 @@ module HTTPX
     @selectables: Array[selectable]
 
     def register: (selectable io) -> void
-    def deregister: (selectable io) -> void
+    def deregister: (selectable io) -> selectable?
 
     def select: (Numeric? interval) { (selectable) -> void } -> void
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -81,6 +81,9 @@ extra_rdoc_files:
 - doc/release_notes/0_19_8.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_20_0.md
+- doc/release_notes/0_20_1.md
+- doc/release_notes/0_20_2.md
+- doc/release_notes/0_20_3.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md
@@ -154,6 +157,9 @@ files:
 - doc/release_notes/0_19_8.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_20_0.md
+- doc/release_notes/0_20_1.md
+- doc/release_notes/0_20_2.md
+- doc/release_notes/0_20_3.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
 - doc/release_notes/0_3_0.md