httpx 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef9f0a027f7a313547ca11bce6cf2c5a3eb72075b2cee0be13448d4aa7ec2b6
-  data.tar.gz: 0021a6c5e4968dd68cb23a157c5ce0dd84021bf134eb6c8227c5b145772e5812
+  metadata.gz: 39a2d410f391dedb077e3704edeafde92786201ebd7b1d3e4e2f6aa7e254797b
+  data.tar.gz: bdcc46a37c8cc4ba8edd11355c5dc439a7401569c8ef014c7ca45ac22e97d284
 SHA512:
-  metadata.gz: 14687b4930aff7fef833058a27d5b26e4a9c327fcbf779f88d3b2b7766a861a26845285054ccde501a5a8296fdfc3c87a5f7e56eafc58fabeecd383512d36e8c
-  data.tar.gz: 95ee1b01958d2c680e194baa2f3136464c775038e9cd87d7d712d88998f48bbd385d6f3cc1173d2bda023102c4ca4661221aabd03d0d8a0a62e3006a79694851
+  metadata.gz: df50d7db27a18a2f7d610e12b618fc1a8ab2d18a6a1f3bbd70054a4fdab9bec8a8e428115696d5f042f28c7409e7539eaca0f3798d13bc6ab98d88e43d41808d
+  data.tar.gz: 63563a10039713d75e6d3d795ddfc08f91a46c2f73225b9987e96acbed9e23d0c5e69154589afbf0163ec69ff99eb9c34f517fb9d360ad7f951a06fb5569ce95

data/doc/release_notes/1_1_1.md

@@ -0,0 +1,17 @@
+# 1.1.1
+
+## improvements
+
+* (Re-)enabling default retries in DNS name queries; this had been disabled as a result of revamping timouts, and resulted in queries only being sent once, which is very little for UDP-related traffic, and breaks if using DNs rate-limiting software. Retries the query just once, for now.
+
+## bugfixes
+
+* reset timers when adding new intervals, as these may be added as a result on after-select connection handling, and must wait for the next tick cycle (before the patch, they were triggering too soon).
+* fixed "on close" callback leak on connection reuse, which caused linear performance regression in benchmarks performing one request per connection.
+* fixed hanging connection whan an HTTP/1.1 emitted a "connection: close" header but the server would not emit one (it closes the connection now).
+* fixed recursive dns cached lookups which may have already expired, and created nil entries in the returned address list.
+* dns system resolver is now able to retry on failure.
+
+## chore
+
+* remove duplicated callback unregitering connections.

data/lib/httpx/connection/http1.rb

@@ -181,7 +181,7 @@ module HTTPX
       if response.is_a?(ErrorResponse)
         disable
       else
-        manage_connection(response)
+        manage_connection(request, response)
       end
 
       if exhausted?
@@ -224,7 +224,7 @@ module HTTPX
 
     private
 
-    def manage_connection(response)
+    def manage_connection(request, response)
       connection = response.headers["connection"]
       case connection
       when /keep-alive/i
@@ -254,7 +254,7 @@ module HTTPX
         disable
       when nil
         # In HTTP/1.1, it's keep alive by default
-        return if response.version == "1.1"
+        return if response.version == "1.1" && request.headers["connection"] != "close"
 
         disable
       end

data/lib/httpx/connection.rb

@@ -273,7 +273,7 @@ module HTTPX
     end
 
     def timeout
-      return @timeout if defined?(@timeout)
+      return @timeout if @timeout
 
       return @options.timeout[:connect_timeout] if @state == :idle
 
@@ -518,7 +518,6 @@ module HTTPX
         else
           transition(:closing)
           transition(:closed)
-          emit(:reset)
 
           @parser.reset if @parser
           transition(:idle)
@@ -617,7 +616,7 @@ module HTTPX
     def purge_after_closed
       @io.close if @io
       @read_buffer.clear
-      remove_instance_variable(:@timeout) if defined?(@timeout)
+      @timeout = nil
     end
 
     def build_socket(addrs = nil)

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

@@ -76,7 +76,6 @@ module HTTPX
                   else
                     transition(:closing)
                     transition(:closed)
-                    emit(:reset)
 
                     parser.reset if @parser
                     transition(:idle)

data/lib/httpx/pool.rb

@@ -223,9 +223,6 @@ module HTTPX
         @connected_connections += 1
       end
       select_connection(connection)
-      connection.on(:close) do
-        unregister_connection(connection)
-      end
     end
 
     def unregister_connection(connection)

data/lib/httpx/resolver/resolver.rb

@@ -62,8 +62,11 @@ module HTTPX
          addresses.first.to_s != connection.origin.host.to_s
         log { "resolver: A response, applying resolution delay..." }
         @pool.after(0.05) do
-          # double emission check
-          emit_resolved_connection(connection, addresses) unless connection.addresses && addresses.intersect?(connection.addresses)
+          unless connection.state == :closed ||
+                 # double emission check
+                 (connection.addresses && addresses.intersect?(connection.addresses))
+            emit_resolved_connection(connection, addresses)
+          end
         end
       else
         emit_resolved_connection(connection, addresses)

data/lib/httpx/resolver/system.rb

@@ -164,7 +164,8 @@ module HTTPX
     def async_resolve(connection, hostname, scheme)
       families = connection.options.ip_families
       log { "resolver: query for #{hostname}" }
-      resolve_timeout = @timeouts[connection.origin.host].first
+      timeouts = @timeouts[connection.origin.host]
+      resolve_timeout = timeouts.first
 
       Thread.start do
         Thread.current.report_on_exception = false
@@ -191,6 +192,8 @@ module HTTPX
           end
         rescue StandardError => e
           if e.is_a?(Timeout::Error)
+            timeouts.shift
+            retry unless timeouts.empty?
             e = ResolveTimeoutError.new(resolve_timeout, e.message)
             e.set_backtrace(e.backtrace)
           end

data/lib/httpx/resolver.rb

@@ -5,7 +5,7 @@ require "ipaddr"
 
 module HTTPX
   module Resolver
-    RESOLVE_TIMEOUT = 5
+    RESOLVE_TIMEOUT = [2, 3].freeze
 
     require "httpx/resolver/resolver"
     require "httpx/resolver/system"
@@ -87,16 +87,18 @@ module HTTPX
     def lookup(hostname, ttl)
       return unless @lookups.key?(hostname)
 
-      @lookups[hostname] = @lookups[hostname].select do |address|
+      entries = @lookups[hostname] = @lookups[hostname].select do |address|
         address["TTL"] > ttl
       end
-      ips = @lookups[hostname].flat_map do |address|
+
+      ips = entries.flat_map do |address|
         if address.key?("alias")
           lookup(address["alias"], ttl)
         else
           IPAddr.new(address["data"])
         end
-      end
+      end.compact
+
       ips unless ips.empty?
     end
 

data/lib/httpx/session.rb

@@ -260,7 +260,9 @@ module HTTPX
       connection.on(:open) do
         emit(:connection_opened, connection.origin, connection.io.socket)
         # only run close callback if it opened
-        connection.on(:close) { emit(:connection_closed, connection.origin, connection.io.socket) }
+      end
+      connection.on(:close) do
+        emit(:connection_closed, connection.origin, connection.io.socket) if connection.used?
       end
       catch(:coalesced) do
         pool.init_connection(connection, options)

data/lib/httpx/timers.rb

@@ -24,6 +24,8 @@ module HTTPX
 
       interval << callback
 
+      @next_interval_at = nil
+
       interval
     end
 

data/lib/httpx/version.rb

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

data/sig/connection/http1.rbs

@@ -59,13 +59,13 @@ module HTTPX
 
     def initialize: (Buffer, options) -> untyped
 
-    def manage_connection: (Response) -> void
+    def manage_connection: (Request request, Response response) -> void
 
     def disable: () -> void
 
     def disable_pipelining: () -> void
 
-    def set_protocol_headers: (Request) -> _Each[[String, String]]
+    def set_protocol_headers: (Request request) -> _Each[[String, String]]
 
     def handle: (Request request) -> void
 

data/sig/resolver.rbs

@@ -2,7 +2,7 @@ module HTTPX
   type ipaddr = IPAddr | String
 
   module Resolver
-    RESOLVE_TIMEOUT: Integer
+    RESOLVE_TIMEOUT: Array[Integer]
 
     @lookup_mutex: Thread::Mutex
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-30 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -132,6 +132,7 @@ extra_rdoc_files:
 - doc/release_notes/1_0_1.md
 - doc/release_notes/1_0_2.md
 - doc/release_notes/1_1_0.md
+- doc/release_notes/1_1_1.md
 files:
 - LICENSE.txt
 - README.md
@@ -235,6 +236,7 @@ files:
 - doc/release_notes/1_0_1.md
 - doc/release_notes/1_0_2.md
 - doc/release_notes/1_1_0.md
+- doc/release_notes/1_1_1.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb