httpx 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3be0d06eb9b669cc4a1ba0818d39c76bdd4cdf41e496cb82efbb83b7c6c47241
-  data.tar.gz: bf778691f222095e080c83b16f71b3d9c8065db9f98f35498eeea317f013a686
+  metadata.gz: 36f5b3d4da61a1a6c86602205a6eda217f51b40411865589587a09553eb263cb
+  data.tar.gz: 9b705a6b8bc7ebf1ec2e308ae6b49bfcc3ede818bbca0dcf4b2fb82dde1cace6
 SHA512:
-  metadata.gz: 26045db79f85f7a136771bdca1852d93be6ad9c84a4285d26c7a97543e0209588fdc423276ea593c9ad26db960ec81a444326a01223e24a932cca8318f08e4ab
-  data.tar.gz: c280576f30f55590336c70c93ea63a4be1e9a8ac238318417b9c4227889518c04f2545d70c0dce74c4026465ad9a7e68f0a05ac6d9728a1035e8ba5c094036fc
+  metadata.gz: 72759cee17931e45580673c119fffd7339afdfe149f6a4a14afa410d11c47b0d84146a70660b5ca8ff63b1d0b6c1d16a85008416348cd48cddd3f9a9c94f3c10
+  data.tar.gz: 1233281adc13e03e5b754ef6d5d830e84335f5f8b3cc90dea33e27c9f5751f2e3f7d20e1d6064b9273678612a3e4505d8d54b3038b85855bc25a72c6d73d914c

data/doc/release_notes/1_4_3.md

@@ -0,0 +1,11 @@
+# 1.4.3
+
+## Bugfixes
+
+* `webmock` adapter: reassign headers to signature after callbacks are called (these may change the headers before virtual send).
+* do not close request (and its body) right after sending, instead only on response close
+  * prevents retries from failing under the `:retries` plugin
+  * fixes issue when using `faraday-multipart` request bodies
+* retry request with HTTP/1 when receiving an HTTP/2 GOAWAY frame with `HTTP_1_1_REQUIRED` error code.
+* fix wrong method call on HTTP/2 PING frame with unrecognized code.
+* fix EOFError issues on connection termination for long running connections which may have already been terminated by peer and were wrongly trying to complete the HTTP/2 termination handshake.

data/lib/httpx/adapters/webmock.rb

@@ -122,6 +122,8 @@ module WebMock
             request.transition(:done)
             request.response = response
             request.emit(:response, response)
+            request_signature.headers = request.headers.to_h
+
             response << mock_response.body.dup unless response.is_a?(HTTPX::ErrorResponse)
           elsif WebMock.net_connect_allowed?(request_signature.uri)
             if WebMock::CallbackRegistry.any_callbacks?

data/lib/httpx/connection/http2.rb

@@ -16,6 +16,12 @@ module HTTPX
       end
     end
 
+    class PingError < Error
+      def initialize
+        super(0, :ping_error)
+      end
+    end
+
     class GoawayError < Error
       def initialize
         super(0, :no_error)
@@ -311,17 +317,20 @@ module HTTPX
       @streams.delete(request)
 
       if error
-        ex = Error.new(stream.id, error)
-        ex.set_backtrace(caller)
-        response = ErrorResponse.new(request, ex)
-        request.response = response
-        emit(:response, request, response)
+        case error
+        when :http_1_1_required
+          emit(:error, request, error)
+        else
+          ex = Error.new(stream.id, error)
+          ex.set_backtrace(caller)
+          response = ErrorResponse.new(request, ex)
+          request.response = response
+          emit(:response, request, response)
+        end
       else
         response = request.response
         if response && response.is_a?(Response) && response.status == 421
-          ex = MisdirectedRequestError.new(response)
-          ex.set_backtrace(caller)
-          emit(:error, request, ex)
+          emit(:error, request, :http_1_1_required)
         else
           emit(:response, request, response)
         end
@@ -352,7 +361,12 @@ module HTTPX
       is_connection_closed = @connection.state == :closed
       if error
         @buffer.clear if is_connection_closed
-        if error == :no_error
+        case error
+        when :http_1_1_required
+          while (request = @pending.shift)
+            emit(:error, request, error)
+          end
+        when :no_error
           ex = GoawayError.new
           @pending.unshift(*@streams.keys)
           @drains.clear
@@ -360,8 +374,11 @@ module HTTPX
         else
           ex = Error.new(0, error)
         end
-        ex.set_backtrace(caller)
-        handle_error(ex)
+
+        if ex
+          ex.set_backtrace(caller)
+          handle_error(ex)
+        end
       end
       return unless is_connection_closed && @streams.empty?
 
@@ -403,11 +420,9 @@ module HTTPX
     end
 
     def on_pong(ping)
-      if @pings.delete(ping.to_s)
-        emit(:pong)
-      else
-        close(:protocol_error, "ping payload did not match")
-      end
+      raise PingError unless @pings.delete(ping.to_s)
+
+      emit(:pong)
     end
   end
 end

data/lib/httpx/connection.rb

@@ -423,6 +423,8 @@ module HTTPX
             siz = @io.read(@window_size, @read_buffer)
             log(level: 3, color: :cyan) { "IO READ: #{siz} bytes... (wsize: #{@window_size}, rbuffer: #{@read_buffer.bytesize})" }
             unless siz
+              @write_buffer.clear
+
               ex = EOFError.new("descriptor closed")
               ex.set_backtrace(caller)
               on_error(ex)
@@ -610,9 +612,9 @@ module HTTPX
       parser.on(:timeout) do |tout|
         @timeout = tout
       end
-      parser.on(:error) do |request, ex|
-        case ex
-        when MisdirectedRequestError
+      parser.on(:error) do |request, error|
+        case error
+        when :http_1_1_required
           current_session = @current_session
           current_selector = @current_selector
           parser.close
@@ -628,7 +630,7 @@ module HTTPX
           next unless request.active_timeouts.empty?
         end
 
-        response = ErrorResponse.new(request, ex)
+        response = ErrorResponse.new(request, error)
         request.response = response
         request.emit(:response, response)
       end

data/lib/httpx/errors.rb

@@ -115,8 +115,4 @@ module HTTPX
       @response.status
     end
   end
-
-  # error raised when a request was sent a server which can't reproduce a response, and
-  # has therefore returned an HTTP response using the 421 status code.
-  class MisdirectedRequestError < HTTPError; end
 end

data/lib/httpx/loggable.rb

@@ -15,10 +15,10 @@ module HTTPX
 
     USE_DEBUG_LOG = ENV.key?("HTTPX_DEBUG")
 
-    def log(level: @options.debug_level, color: nil, &msg)
-      return unless @options.debug_level >= level
+    def log(level: @options.debug_level, color: nil, debug_level: @options.debug_level, debug: @options.debug, &msg)
+      return unless debug_level >= level
 
-      debug_stream = @options.debug || ($stderr if USE_DEBUG_LOG)
+      debug_stream = debug || ($stderr if USE_DEBUG_LOG)
 
       return unless debug_stream
 
@@ -34,8 +34,8 @@ module HTTPX
       debug_stream << message
     end
 
-    def log_exception(ex, level: @options.debug_level, color: nil)
-      log(level: level, color: color) { ex.full_message }
+    def log_exception(ex, level: @options.debug_level, color: nil, debug_level: @options.debug_level, debug: @options.debug)
+      log(level: level, color: color, debug_level: debug_level, debug: debug) { ex.full_message }
     end
   end
 end

data/lib/httpx/plugins/internal_telemetry.rb

@@ -13,6 +13,12 @@ module HTTPX
     # by the end user in $http_init_time, different diff metrics can be shown. The "point of time" is calculated
     # using the monotonic clock.
     module InternalTelemetry
+      DEBUG_LEVEL = 3
+
+      def self.extra_options(options)
+        options.merge(debug_level: 3)
+      end
+
       module TrackTimeMethods
         private
 
@@ -28,7 +34,19 @@ module HTTPX
           after_time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
           # $http_init_time = after_time
           elapsed = after_time - prev_time
-          warn(+"\e[31m" << "[ELAPSED TIME]: #{label}: #{elapsed} (ms)" << "\e[0m")
+          # klass = self.class
+
+          # until (class_name = klass.name)
+          #   klass = klass.superclass
+          # end
+          log(
+            level: DEBUG_LEVEL,
+            color: :red,
+            debug_level: @options ? @options.debug_level : DEBUG_LEVEL,
+            debug: nil
+          ) do
+            "[ELAPSED TIME]: #{label}: #{elapsed} (ms)" << "\e[0m"
+          end
         end
       end
 
@@ -88,6 +106,7 @@ module HTTPX
 
       module RequestMethods
         def self.included(klass)
+          klass.prepend Loggable
           klass.prepend TrackTimeMethods
           super
         end
@@ -114,6 +133,7 @@ module HTTPX
 
       module PoolMethods
         def self.included(klass)
+          klass.prepend Loggable
           klass.prepend TrackTimeMethods
           super
         end

data/lib/httpx/plugins/retries.rb

@@ -167,7 +167,7 @@ module HTTPX
           unless response.headers.key?("accept-ranges") &&
                  response.headers["accept-ranges"] == "bytes" && # there's nothing else supported though...
                  (original_body = response.body)
-            response.close if response.respond_to?(:close)
+            response.body.close
             return
           end
 

data/lib/httpx/request.rb

@@ -50,6 +50,9 @@ module HTTPX
     # will be +true+ when request body has been completely flushed.
     def_delegator :@body, :empty?
 
+    # closes the body
+    def_delegator :@body, :close
+
     # initializes the instance with the given +verb+ (an upppercase String, ex. 'GEt'),
     # an absolute or relative +uri+ (either as String or URI::HTTP object), the
     # request +options+ (instance of HTTPX::Options) and an optional Hash of +params+.
@@ -273,7 +276,6 @@ module HTTPX
       when :done
         return if @state == :expect
 
-        @body.close
       end
       @state = nextstate
       emit(@state, self)

data/lib/httpx/response.rb

@@ -52,9 +52,6 @@ module HTTPX
     # copies the response body to a different location.
     def_delegator :@body, :copy_to
 
-    # closes the body.
-    def_delegator :@body, :close
-
     # the corresponding request uri.
     def_delegator :@request, :uri
 
@@ -74,6 +71,12 @@ module HTTPX
       @content_type = nil
     end
 
+    # closes the respective +@request+ and +@body+.
+    def close
+      @request.close
+      @body.close
+    end
+
     # merges headers defined in +h+ into the response headers.
     def merge_headers(h)
       @headers = @headers.merge(h)
@@ -264,7 +267,7 @@ module HTTPX
 
     # closes the error resources.
     def close
-      @response.close if @response && @response.respond_to?(:close)
+      @response.close if @response
     end
 
     # always true for error responses.
@@ -279,6 +282,8 @@ module HTTPX
 
     # buffers lost chunks to error response
     def <<(data)
+      return unless @response
+
       @response << data
     end
   end

data/lib/httpx/transcoder/multipart/encoder.rb

@@ -11,6 +11,7 @@ module HTTPX
         @buffer = "".b
 
         @form = form
+        @bytesize = 0
         @parts = to_parts(form)
       end
 
@@ -42,6 +43,7 @@ module HTTPX
           aux << [key, val]
         end
         @form = form
+        @bytesize = 0
         @parts = to_parts(form)
         @part_index = 0
       end
@@ -49,7 +51,6 @@ module HTTPX
       private
 
       def to_parts(form)
-        @bytesize = 0
         params = form.each_with_object([]) do |(key, val), aux|
           Transcoder.normalize_keys(key, val, MULTIPART_VALUE_COND) do |k, v|
             next if v.nil?

data/lib/httpx/version.rb

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

data/sig/connection/http2.rbs

@@ -8,6 +8,7 @@ module HTTPX
     attr_reader streams: Hash[Request, ::HTTP2::Stream]
     attr_reader pending: Array[Request]
 
+    @connection: HTTP2::Client
     @options: Options
     @settings: Hash[Symbol, Integer | bool]
     @max_concurrent_requests: Integer
@@ -95,5 +96,8 @@ module HTTPX
 
     class GoawayError < Error
     end
+
+    class PingError < Error
+    end
   end
 end

data/sig/errors.rbs

@@ -67,7 +67,4 @@ module HTTPX
 
     def initialize: (Connection connection, String hostname, ?String message) -> untyped
   end
-
-  class MisdirectedRequestError < HTTPError
-  end
 end

data/sig/loggable.rbs

@@ -8,8 +8,8 @@ module HTTPX
 
     COLORS: Hash[Symbol, Integer]
 
-    def log: (?level: Integer?, ?color: Symbol?) { () -> String } -> void
+    def log: (?level: Integer?, ?color: Symbol?, ?debug_level: Integer, ?debug: _IOLogger?) { () -> String } -> void
 
-    def log_exception: (Exception error, ?level: Integer, ?color: Symbol) -> void
+    def log_exception: (Exception error, ?level: Integer, ?color: Symbol, ?debug_level: Integer, ?debug: _IOLogger?) -> void
   end
 end

data/sig/plugins/query.rbs

@@ -0,0 +1,18 @@
+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/pool.rbs

@@ -5,6 +5,8 @@ module HTTPX
   }
 
   class Pool
+    POOL_TIMEOUT: Integer
+
     type resolver_manager = Resolver::Multi | Resolver::System
 
     @max_connections_per_origin: Integer

data/sig/request.rbs

@@ -28,6 +28,10 @@ module HTTPX
 
     def initialize: (Symbol | String verb, generic_uri uri, Options options, ?request_params params) -> untyped
 
+    def empty?: () -> bool
+
+    def close: () -> void
+
     def interests: () -> (:r | :w)
 
     def merge_headers: (_Each[[String, headers_value]]) -> void

data/sig/response.rbs

@@ -1,5 +1,7 @@
 module HTTPX
   interface _Response
+    def <<: (String data) -> void
+
     def finished?: () -> bool
 
     def raise_for_status: () -> self
@@ -23,6 +25,7 @@ module HTTPX
     @options: Options
     @request: Request
     @content_type: ContentType
+    @finished: bool
 
     def copy_to: (_ToPath | _Writer destination) -> void
 
@@ -38,9 +41,11 @@ module HTTPX
 
     def content_type: () -> ContentType
 
+    def finish!: () -> void
+
     def complete?: () -> bool
 
-    def json: (?json_options opts) -> untyped
+    def json: (?JSON::options opts) -> untyped
 
     def form: () -> Hash[String, untyped]
 
@@ -77,9 +82,9 @@ module HTTPX
     @options: Options
     @error: Exception
 
-    attr_reader request: Request
+    %a{pure} attr_reader request: Request
 
-    attr_reader response: Response?
+    %a{pure} attr_reader response: Response?
 
     def status: () -> (Integer | _ToS)
 

data/sig/transcoder/json.rbs

@@ -5,7 +5,7 @@ module HTTPX::Transcoder
     def self?.encode: (_ToJson json) -> Encoder
     def self?.decode: (HTTPX::Response response) -> _Decoder
 
-    def self?.json_load: (string source, ?json_options) -> untyped
+    def self?.json_load: (string source, ?JSON::options) -> untyped
     def self?.json_dump: (_ToJson obj, *untyped) -> String
 
     class Encoder

data/sig/transcoder/multipart.rbs

@@ -24,7 +24,7 @@ module HTTPX
         @form: Enumerable[[Symbol | string, Object & multipart_nested_value]]
         @parts: Array[Object & _Reader]
 
-        def bytesize: () -> Integer
+        attr_reader bytesize: Integer
 
         def content_type: () -> String
 

data/sig/transcoder/utils/deflater.rbs

@@ -5,7 +5,6 @@ module HTTPX
 
       @body: BodyReader
       @buffer: Response::Buffer?
-      @body: BodyReader
       @closed: bool
 
       attr_reader content_type: String

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Tiago Cardoso
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-05 00:00:00.000000000 Z
+date: 2025-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -152,6 +151,7 @@ extra_rdoc_files:
 - doc/release_notes/1_4_0.md
 - doc/release_notes/1_4_1.md
 - doc/release_notes/1_4_2.md
+- doc/release_notes/1_4_3.md
 files:
 - LICENSE.txt
 - README.md
@@ -275,6 +275,7 @@ files:
 - doc/release_notes/1_4_0.md
 - doc/release_notes/1_4_1.md
 - doc/release_notes/1_4_2.md
+- doc/release_notes/1_4_3.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb
@@ -435,6 +436,7 @@ 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
@@ -480,7 +482,6 @@ metadata:
   source_code_uri: https://gitlab.com/os85/httpx
   homepage_uri: https://honeyryderchuck.gitlab.io/httpx/
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -495,8 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: HTTPX, to the future, and beyond
 test_files: []