httpx 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f5b3d4da61a1a6c86602205a6eda217f51b40411865589587a09553eb263cb
-  data.tar.gz: 9b705a6b8bc7ebf1ec2e308ae6b49bfcc3ede818bbca0dcf4b2fb82dde1cace6
+  metadata.gz: 4aa5b1cfd43d05f50fc7246219d6a90cb5591e11c8bfeee1f1cf62ffa91993fc
+  data.tar.gz: 58f96325ac13b8caddb708464a75ee6dafcfe7b8284f0825803ac3d0c4d8ccc1
 SHA512:
-  metadata.gz: 72759cee17931e45580673c119fffd7339afdfe149f6a4a14afa410d11c47b0d84146a70660b5ca8ff63b1d0b6c1d16a85008416348cd48cddd3f9a9c94f3c10
-  data.tar.gz: 1233281adc13e03e5b754ef6d5d830e84335f5f8b3cc90dea33e27c9f5751f2e3f7d20e1d6064b9273678612a3e4505d8d54b3038b85855bc25a72c6d73d914c
+  metadata.gz: 43a032f78a86df04428af78f32077483b8c01500ebb001ec97100ac3923b4915a28b299cadb8b47fab8fa875c3897732c21eec63769ad98dfd98b901f006b051
+  data.tar.gz: dfff14a83428e2472ff53a50cadf5dd7a270f09523eca4c5aa66e7a3093ca8bd096c9c3d12070ed6a54ef1ddaec4966efd456653e666429f0ce47f04fe68e35a

data/doc/release_notes/1_4_4.md

@@ -0,0 +1,14 @@
+# 1.4.4
+
+## Improvements
+
+* `:stream` plugin: response will now be partially buffered in order to i.e. inspect response status or headers on the response body without buffering the full response
+  * this fixes an issue in the `down` gem integration when used with the `:max_size` option.
+* do not unnecessarily probe for connection liveness if no more requests are inflight, including failed ones.
+* when using persistent connections, do not probe for liveness right after reconnecting after a keep alive timeout.
+
+## Bugfixes
+
+* `:persistent` plugin: do not exhaust retry attempts when probing for (and failing) connection liveness.
+  * since the introduction of per-session connection pools, and consequentially due to the possibility of multiple inactive connections for the same origin being in the pool, which may have been terminated by the peer server, requests would fail before being able to establish a new connection.
+* prevent retrying to connect the TCP socket object when an SSLSocket object is already in place and connecting.

data/lib/httpx/adapters/webmock.rb

@@ -58,6 +58,8 @@ module WebMock
           super
 
           connection.once(:unmock_connection) do
+            next unless connection.current_session == self
+
             unless connection.addresses
               # reset Happy Eyeballs, fail early
               connection.sibling = nil

data/lib/httpx/connection.rb

@@ -296,6 +296,7 @@ module HTTPX
           @pending << request
           transition(:active) if @state == :inactive
           parser.ping
+          request.ping!
           return
         end
 
@@ -630,6 +631,7 @@ module HTTPX
           next unless request.active_timeouts.empty?
         end
 
+        @inflight -= 1
         response = ErrorResponse.new(request, error)
         request.response = response
         request.emit(:response, response)
@@ -670,7 +672,7 @@ module HTTPX
       when :idle
         @timeout = @current_timeout = @options.timeout[:connect_timeout]
 
-        @connected_at = nil
+        @connected_at = @response_received_at = nil
       when :open
         return if @state == :closed
 
@@ -843,6 +845,7 @@ module HTTPX
 
       return unless request
 
+      @inflight -= 1
       response = ErrorResponse.new(request, error)
       request.response = response
       request.emit(:response, response)

data/lib/httpx/io/ssl.rb

@@ -92,9 +92,12 @@ module HTTPX
     end
 
     def connect
-      super
-      return if @state == :negotiated ||
-                @state != :connected
+      return if @state == :negotiated
+
+      unless @state == :connected
+        super
+        return unless @state == :connected
+      end
 
       unless @io.is_a?(OpenSSL::SSL::SSLSocket)
         if (hostname_is_ip = (@ip == @sni_hostname))

data/lib/httpx/plugins/retries.rb

@@ -110,7 +110,7 @@ module HTTPX
              )
             __try_partial_retry(request, response)
             log { "failed to get response, #{request.retries} tries to go..." }
-            request.retries -= 1
+            request.retries -= 1 unless request.ping? # do not exhaust retries on connection liveness probes
             request.transition(:idle)
 
             retry_after = options.retry_after

data/lib/httpx/plugins/stream.rb

@@ -4,27 +4,39 @@ module HTTPX
   class StreamResponse
     def initialize(request, session)
       @request = request
+      @options = @request.options
       @session = session
-      @response = nil
+      @response_enum = nil
+      @buffered_chunks = []
     end
 
     def each(&block)
       return enum_for(__method__) unless block
 
+      if (response_enum = @response_enum)
+        @response_enum = nil
+        # streaming already started, let's finish it
+
+        while (chunk = @buffered_chunks.shift)
+          block.call(chunk)
+        end
+
+        # consume enum til the end
+        begin
+          while (chunk = response_enum.next)
+            block.call(chunk)
+          end
+        rescue StopIteration
+          return
+        end
+      end
+
       @request.stream = self
 
       begin
         @on_chunk = block
 
-        if @request.response
-          # if we've already started collecting the payload, yield it first
-          # before proceeding.
-          body = @request.response.body
-
-          body.each do |chunk|
-            on_chunk(chunk)
-          end
-        end
+        response = @session.request(@request)
 
         response.raise_for_status
       ensure
@@ -64,27 +76,39 @@ module HTTPX
     # :nocov:
 
     def to_s
-      response.to_s
+      if @request.response
+        @request.response.to_s
+      else
+        @buffered_chunks.join
+      end
     end
 
     private
 
     def response
-      return @response if @response
-
       @request.response || begin
-        @response = @session.request(@request)
+        response_enum = each
+        while (chunk = response_enum.next)
+          @buffered_chunks << chunk
+          break if @request.response
+        end
+        @response_enum = response_enum
+        @request.response
       end
     end
 
-    def respond_to_missing?(meth, *args)
-      response.respond_to?(meth, *args) || super
+    def respond_to_missing?(meth, include_private)
+      if (response = @request.response)
+        response.respond_to_missing?(meth, include_private)
+      else
+        @options.response_class.method_defined?(meth) || (include_private && @options.response_class.private_method_defined?(meth))
+      end || super
     end
 
-    def method_missing(meth, *args, &block)
+    def method_missing(meth, *args, **kwargs, &block)
       return super unless response.respond_to?(meth)
 
-      response.__send__(meth, *args, &block)
+      response.__send__(meth, *args, **kwargs, &block)
     end
   end
 

data/lib/httpx/request.rb

@@ -104,21 +104,32 @@ module HTTPX
       @state = :idle
       @response = nil
       @peer_address = nil
+      @ping = false
       @persistent = @options.persistent
       @active_timeouts = []
     end
 
-    # the read timeout defined for this requet.
+    # whether request has been buffered with a ping
+    def ping?
+      @ping
+    end
+
+    # marks the request as having been buffered with a ping
+    def ping!
+      @ping = true
+    end
+
+    # the read timeout defined for this request.
     def read_timeout
       @options.timeout[:read_timeout]
     end
 
-    # the write timeout defined for this requet.
+    # the write timeout defined for this request.
     def write_timeout
       @options.timeout[:write_timeout]
     end
 
-    # the request timeout defined for this requet.
+    # the request timeout defined for this request.
     def request_timeout
       @options.timeout[:request_timeout]
     end
@@ -249,6 +260,7 @@ module HTTPX
       case nextstate
       when :idle
         @body.rewind
+        @ping = false
         @response = nil
         @drainer = nil
         @active_timeouts.clear

data/lib/httpx/session.rb

@@ -188,14 +188,9 @@ module HTTPX
         else
           pin_connection(connection, selector)
         end
-      when :closed
+      when :closing, :closed
         connection.idling
         select_connection(connection, selector)
-      when :closing
-        connection.once(:close) do
-          connection.idling
-          select_connection(connection, selector)
-        end
       else
         pin_connection(connection, selector)
       end
@@ -371,6 +366,8 @@ module HTTPX
         coalesce_connections(found_connection, connection, selector, from_pool)
       else
         found_connection.once(:open) do
+          next unless found_connection.current_session == self
+
           coalesce_connections(found_connection, connection, selector, from_pool)
         end
       end

data/lib/httpx/version.rb

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

data/sig/plugins/stream.rbs

@@ -27,7 +27,10 @@ module HTTPX
     type streamRequest = Request & Plugins::Stream::RequestMethods
 
     @request: streamRequest
+    @options: Options
     @session: Plugins::sessionStream
+    @response_enum: Enumerator[String]?
+    @buffered_chunks: Array[String]
     @on_chunk: ^(String) -> void | nil
 
     def each: () { (String) -> void } -> void

data/sig/request.rbs

@@ -20,6 +20,7 @@ module HTTPX
 
     attr_writer persistent: bool
 
+    @ping: bool
     @query_params: Hash[interned, untyped]?
     @trailers: Headers?
     @informational_status: Integer?
@@ -28,6 +29,10 @@ module HTTPX
 
     def initialize: (Symbol | String verb, generic_uri uri, Options options, ?request_params params) -> untyped
 
+    def ping?: () -> bool
+
+    def ping!: () -> void
+
     def empty?: () -> bool
 
     def close: () -> void

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Tiago Cardoso
 bindir: bin
 cert_chain: []
-date: 2025-03-25 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -152,6 +152,7 @@ extra_rdoc_files:
 - doc/release_notes/1_4_1.md
 - doc/release_notes/1_4_2.md
 - doc/release_notes/1_4_3.md
+- doc/release_notes/1_4_4.md
 files:
 - LICENSE.txt
 - README.md
@@ -276,6 +277,7 @@ files:
 - doc/release_notes/1_4_1.md
 - doc/release_notes/1_4_2.md
 - doc/release_notes/1_4_3.md
+- doc/release_notes/1_4_4.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb
@@ -364,7 +366,6 @@ files:
 - lib/httpx/response/buffer.rb
 - lib/httpx/selector.rb
 - lib/httpx/session.rb
-- lib/httpx/session2.rb
 - lib/httpx/session_extensions.rb
 - lib/httpx/timers.rb
 - lib/httpx/transcoder.rb
@@ -381,7 +382,6 @@ files:
 - lib/httpx/transcoder/multipart/part.rb
 - lib/httpx/transcoder/utils/body_reader.rb
 - lib/httpx/transcoder/utils/deflater.rb
-- lib/httpx/transcoder/utils/inflater.rb
 - lib/httpx/utils.rb
 - lib/httpx/version.rb
 - sig/altsvc.rbs
@@ -436,7 +436,6 @@ files:
 - sig/plugins/proxy/socks5.rbs
 - sig/plugins/proxy/ssh.rbs
 - sig/plugins/push_promise.rbs
-- sig/plugins/query.rbs
 - sig/plugins/rate_limiter.rbs
 - sig/plugins/response_cache.rbs
 - sig/plugins/retries.rbs
@@ -470,7 +469,6 @@ files:
 - sig/transcoder/multipart.rbs
 - sig/transcoder/utils/body_reader.rbs
 - sig/transcoder/utils/deflater.rbs
-- sig/transcoder/utils/inflater.rbs
 - sig/utils.rbs
 homepage: https://gitlab.com/os85/httpx
 licenses:

data/lib/httpx/session2.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "session"
-module HTTPX
-  class Session
-    def initialize(options = EMPTY, &blk)
-      @options = self.class.default_options.merge(options)
-      @responses = {}
-      @persistent = @options.persistent
-      wrap(&blk) if blk
-    end
-
-    def wrap
-      begin
-        prev_persistent = @persistent
-        @persistent = true
-        yield self
-      ensure
-        @persistent = prev_persistent
-      end
-    end
-  end
-end

data/lib/httpx/transcoder/utils/inflater.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module HTTPX
-  module Transcoder
-    class Inflater
-      def initialize(bytesize)
-        @bytesize = bytesize
-      end
-
-      def call(chunk)
-        buffer = @inflater.inflate(chunk)
-        @bytesize -= chunk.bytesize
-        if @bytesize <= 0
-          buffer << @inflater.finish
-          @inflater.close
-        end
-        buffer
-      end
-    end
-  end
-end

data/sig/plugins/query.rbs

@@ -1,18 +0,0 @@
-module HTTPX
-  module Plugins
-    module Query
-      def self.subplugins: () -> Hash[Symbol, Module]
-
-      module InstanceMethods
-        def query: (uri | [uri], **untyped) -> response
-                 | (_Each[uri | [uri, request_params]], **untyped) -> Array[response]
-      end
-
-      module QueryRetries
-        module InstanceMethods
-        end
-      end
-    end
-    type sessionQuery = Session & Query::InstanceMethods
-  end
-end

data/sig/transcoder/utils/inflater.rbs

@@ -1,12 +0,0 @@
-module HTTPX
-  module Transcoder
-    class Inflater
-      @inflater: Zlib::Inflate
-      @bytesize: Integer
-
-      def initialize: (Integer | Float bytesize) -> void
-
-      def call: (String chunk) -> String
-    end
-  end
-end