httpx 1.7.2 → 1.7.6

data/lib/httpx/session.rb

@@ -140,9 +140,10 @@ module HTTPX
       end
       selector.deregister(connection)
 
+      # do not check-in connections only created for Happy Eyeballs
       return if cloned
 
-      return if @closing && connection.state == :closed
+      return if @closing && connection.state == :closed && !connection.used?
 
       connection.log(level: 2) { "check-in connection##{connection.object_id}(#{connection.state}) in pool##{@pool.object_id}" }
       @pool.checkin_connection(connection)
@@ -177,16 +178,15 @@ module HTTPX
 
     # returns the HTTPX::Connection through which the +request+ should be sent through.
     def find_connection(request_uri, selector, options)
-      log(level: 2) { "finding connection for #{request_uri}..." }
       if (connection = selector.find_connection(request_uri, options))
         connection.idling if connection.state == :closed
-        connection.log(level: 2) { "found connection##{connection.object_id}(#{connection.state}) in selector##{selector.object_id}" }
+        log(level: 2) { "found connection##{connection.object_id}(#{connection.state}) in selector##{selector.object_id}" }
         return connection
       end
 
       connection = @pool.checkout_connection(request_uri, options)
 
-      connection.log(level: 2) { "found connection##{connection.object_id}(#{connection.state}) in pool##{@pool.object_id}" }
+      log(level: 2) { "found connection##{connection.object_id}(#{connection.state}) in pool##{@pool.object_id}" }
 
       case connection.state
       when :idle
@@ -240,7 +240,7 @@ module HTTPX
 
       return unless response && response.finished?
 
-      log(level: 2) { "response fetched" }
+      log(level: 2) { "response##{response.object_id} fetched" }
 
       response
     end
@@ -249,6 +249,7 @@ module HTTPX
     def send_request(request, selector, options = request.options)
       error = begin
         catch(:resolve_error) do
+          log(level: 2) { "finding connection for request##{request.object_id}..." }
           connection = find_connection(request.uri, selector, options)
           connection.send(request)
         end
@@ -324,53 +325,34 @@ module HTTPX
 
     # returns the array of HTTPX::Response objects corresponding to the array of HTTPX::Request +requests+.
     def receive_requests(requests, selector)
-      responses = [] # : Array[response]
-
-      # guarantee ordered responses
-      loop do
-        request = requests.first
-
-        return responses unless request
-
-        catch(:coalesced) { selector.next_tick } until (response = fetch_response(request, selector, request.options))
-        request.complete!(response)
-
-        responses << response
-        requests.shift
-
-        break if requests.empty?
+      waiting = 0
+      responses = requests.map do |request|
+        fetch_response(request, selector, request.options).tap do |response|
+          waiting += 1 if response.nil?
+        end
+      end
 
-        next unless selector.empty?
+      until waiting.zero? || selector.empty?
+        # loop on selector until at least one response has been received.
+        catch(:coalesced) { selector.next_tick }
 
-        # in some cases, the pool of connections might have been drained because there was some
-        # handshake error, and the error responses have already been emitted, but there was no
-        # opportunity to traverse the requests, hence we're returning only a fraction of the errors
-        # we were supposed to. This effectively fetches the existing responses and return them.
-        exit_from_loop = true
+        responses.each_with_index do |response, idx|
+          next unless response.nil?
 
-        requests_to_remove = [] # : Array[Request]
+          request = requests[idx]
 
-        requests.each do |req|
-          response = fetch_response(req, selector, request.options)
+          response = fetch_response(request, selector, request.options)
 
-          if exit_from_loop && response
-            req.complete!(response)
-            responses << response
-            requests_to_remove << req
-          else
-            # fetch_response may resend requests. when that happens, we need to go back to the initial
-            # loop and process the selector. we still do a pass-through on the remainder of requests, so
-            # that every request that need to be resent, is resent.
-            exit_from_loop = false
+          next unless response
 
-            raise Error, "something went wrong, responses not found and requests not resent" if selector.empty?
-          end
+          request.complete!(response)
+          responses[idx] = response
+          waiting -= 1
         end
+      end
 
-        break if exit_from_loop
+      raise Error, "something went wrong, responses not found and requests not resent" unless waiting.zero?
 
-        requests -= requests_to_remove
-      end
       responses
     end
 
@@ -391,7 +373,15 @@ module HTTPX
       resolver = find_resolver_for(connection, selector)
 
       pin(connection, selector)
-      resolver.early_resolve(connection) || resolver.lazy_resolve(connection)
+      if early_resolve(resolver, connection)
+        @pool.checkin_resolver(resolver)
+      else
+        resolver.lazy_resolve(connection)
+      end
+    end
+
+    def early_resolve(resolver, connection)
+      resolver.early_resolve(connection)
     end
 
     def on_resolver_connection(connection, selector)

data/lib/httpx/timers.rb

@@ -6,6 +6,10 @@ module HTTPX
       @intervals = []
     end
 
+    def empty?
+      @intervals.empty?
+    end
+
     def after(interval_in_secs, cb = nil, &blk)
       callback = cb || blk
 

data/lib/httpx/version.rb

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

data/sig/altsvc.rbs

@@ -3,6 +3,8 @@ module HTTPX
     module ConnectionMixin
       H2_ALTSVC_SCHEMES: Array[String]
 
+      ALTSVC_IGNORE_IVARS: Array[Symbol]
+
       def send: (Request request) -> void
 
       def match?: (http_uri uri, Options options) -> bool

data/sig/chainable.rbs

@@ -29,7 +29,7 @@ module HTTPX
               | (:proxy, ?options) -> (Plugins::sessionProxy & Plugins::httpProxy)
               | (:push_promise, ?options) -> Plugins::sessionPushPromise
               | (:retries, ?options) -> Plugins::sessionRetries
-              | (:rate_limiter, ?options) -> Session
+              | (:rate_limiter, ?options) -> Plugins::sessionRateLimiter
               | (:stream, ?options) -> Plugins::sessionStream
               | (:stream_bidi, ?options) -> Plugins::sessionStreamBidi
               | (:aws_sigv4, ?options) -> Plugins::awsSigV4Session
@@ -43,6 +43,7 @@ module HTTPX
               | (:webdav, ?options) -> Plugins::sessionWebDav
               | (:xml, ?options) -> Plugins::sessionXML
               | (:query, ?options) -> Plugins::sessionQuery
+              | (:tracing, ?options) -> Plugins::sessionTracing
               | (Symbol | Module, ?options) { (Class) -> void } -> Session
               | (Symbol | Module, ?options) -> Session
 

data/sig/connection/http1.rbs

@@ -26,6 +26,8 @@ module HTTPX
 
     def reset: () -> void
 
+    def reset_requests: () -> void
+
     def close: () -> void
 
     def empty?: () -> bool
@@ -50,7 +52,7 @@ module HTTPX
 
     def on_complete: () -> void
 
-    def dispatch: () -> void
+    def dispatch: (Request request) -> void
 
     def ping: () -> void
 

data/sig/connection/http2.rbs

@@ -6,6 +6,7 @@ module HTTPX
     MAX_CONCURRENT_REQUESTS: Integer
 
     attr_reader streams: Hash[Request, ::HTTP2::Stream]
+
     attr_reader pending: Array[Request]
 
     @connection: HTTP2::Client
@@ -43,6 +44,8 @@ module HTTPX
 
     def timeout: () -> Numeric?
 
+    def reset_requests: () -> void
+
     private
 
     def initialize: (Buffer buffer, Options options) -> untyped
@@ -79,6 +82,8 @@ module HTTPX
 
     def on_stream_refuse: (::HTTP2::Stream stream, Request request, StandardError error) -> void
 
+    def on_stream_half_close: (::HTTP2::Stream stream, Request request) -> void
+
     def on_stream_close: (::HTTP2::Stream stream, Request request, (Symbol | StandardError)? error) -> void
 
     def on_frame: (string bytes) -> void
@@ -87,13 +92,15 @@ module HTTPX
 
     def on_close: (Integer last_frame, Symbol? error, String? payload) -> void
 
-    def on_frame_sent: (::HTTP2::frame) -> void
+    def on_frame_sent: (::HTTP2::frame frame) -> void
+
+    def frame_with_extra_info: (::HTTP2::frame frame) -> Hash[Symbol, untyped]
 
-    def on_frame_received: (::HTTP2::frame) -> void
+    def on_frame_received: (::HTTP2::frame frame) -> void
 
-    def on_altsvc: (String origin, ::HTTP2::frame) -> void
+    def on_altsvc: (String origin, ::HTTP2::frame frame) -> void
 
-    def on_promise: (::HTTP2::Stream) -> void
+    def on_promise: (::HTTP2::Stream stream) -> void
 
     def on_origin: (String) -> void
 

data/sig/connection.rbs

@@ -37,6 +37,7 @@ module HTTPX
     @read_buffer: Buffer
     @write_buffer: Buffer
     @inflight: Integer
+    @max_concurrent_requests: Integer?
     @keep_alive_timeout: Numeric?
     @timeout: Numeric?
     @current_timeout: Numeric?
@@ -49,6 +50,7 @@ module HTTPX
     @altsvc_connection: instance?
     @sibling: instance?
     @main_sibling: bool
+    @no_more_requests_counter: Integer
 
 
     def addresses: () -> Array[Resolver::Entry]?
@@ -119,6 +121,10 @@ module HTTPX
 
     def on_error: (HTTPX::TimeoutError | Error | StandardError error, ?Request? request) -> void
 
+    def on_io_error: (IOError error) -> void
+
+    def on_connect_error: (Exception error) -> void
+
     private
 
     def initialize: (http_uri uri, Options options) -> void
@@ -151,8 +157,16 @@ module HTTPX
 
     def build_socket: (?Array[Resolver::Entry]? addrs) -> (TCP | SSL | UNIX)
 
+    def ping: () -> void
+
+    def pong: () -> void
+
+    def no_more_requests_loop_check: () -> void
+
     def handle_error: (StandardError error, ?Request? request) -> void
 
+    def force_purge: () -> void
+
     def close_sibling: () -> void
 
     def purge_after_closed: () -> void
@@ -165,9 +179,9 @@ module HTTPX
 
     def set_request_request_timeout: (Request request) -> void
 
-    def write_timeout_callback: (Request request, Numeric write_timeout) -> void
+    def write_timeout_callback: (Request request, Numeric timeout) -> void
 
-    def read_timeout_callback: (Request request, Numeric read_timeout, ?singleton(RequestTimeoutError) error_type) -> void
+    def read_timeout_callback: (Request request, Numeric timeout, ?singleton(RequestTimeoutError) error_type) -> void
 
     def set_request_timeout: (Symbol label, Request request, Numeric timeout, Symbol start_event, Symbol | Array[Symbol] finish_events) { () -> void } -> void
 

data/sig/io/ssl.rbs

@@ -8,6 +8,7 @@ module HTTPX
 
     @ctx: OpenSSL::SSL::SSLContext
     @verify_hostname: bool
+    @sni_hostname: String
 
     attr_writer ssl_session: OpenSSL::SSL::Session?
 

data/sig/io/tcp.rbs

@@ -46,7 +46,7 @@ module HTTPX
 
     public
 
-    def read: (Integer size, ?(Buffer | String) buffer) -> (0 | nil | untyped)
+    def read: (Integer size, Buffer | String buffer) -> (0 | nil | untyped)
 
     def write: (Buffer buffer) -> Integer?
 
@@ -67,6 +67,6 @@ module HTTPX
 
     def do_transition: (Symbol nextstate) -> void
 
-    def log_transition_state: (Symbol nextstate) -> void
+    def log_transition_state: (Symbol nextstate) -> String
   end
 end

data/sig/options.rbs

@@ -17,6 +17,7 @@ module HTTPX
 
     DEFAULT_OPTIONS: Hash[Symbol, untyped]
     REQUEST_BODY_IVARS: Array[Symbol]
+    RESOLVER_IVARS: Array[Symbol]
     RESOLVER_TYPES: Array[Symbol]
     USER_AGENT: String
 
@@ -106,8 +107,10 @@ module HTTPX
 
     attr_reader ssl: Hash[Symbol, untyped]
 
-    # io
-    type io_option = _ToIO | Hash[String, _ToIO]
+    type external_io = TCPSocket | OpenSSL::SSL::SSLSocket | UNIXSocket
+
+    type io_option = external_io | Hash[String, external_io]
+
     attr_reader io: io_option?
 
     # fallback_protocol
@@ -142,7 +145,9 @@ module HTTPX
 
     def ==: (Options other) -> bool
 
-    def options_equals?: (Options other, ?Array[Symbol] ignore_ivars) -> bool
+    def connection_options_match?: (Options other, ?Array[Symbol] ignore_ivars) -> bool
+
+    def resolver_options_match?: (Options other) -> bool
 
     def merge: (Object & _ToHash[Symbol, untyped] other) -> (instance | self)
 

data/sig/parser/http1.rbs

@@ -23,7 +23,7 @@ module HTTPX
 
       @observer: _HTTP1Events
       @state: Symbol
-      @buffer: String
+      @buffer: String | Transcoder::Chunker::Decoder
       @content_type: String?
       @content_length: Integer
       @_has_trailers: bool

data/sig/plugins/auth.rbs

@@ -10,7 +10,8 @@ module HTTPX
       end
 
       module InstanceMethods
-        @auth_header_value: String
+        @auth_header_value: String?
+        @auth_header_value_mtx: Thread::Mutex
         @skip_auth_header_value: bool
 
         def authorization: (?string token, ?auth_header_type: string) ?{ (Request) -> string } -> instance
@@ -29,7 +30,9 @@ module HTTPX
       end
 
       module RequestMethods
-        @auth_token_value: String?
+        attr_reader auth_token_value: String?
+
+        @auth_header_value: String?
 
         def authorized?: () -> bool
 

data/sig/plugins/brotli.rbs

@@ -5,17 +5,22 @@ module HTTPX
 
       def self?.encode: (body_encoder body) -> Deflater
 
-      def self?.decode: (HTTPX::Response response, ?bytesize: Integer) -> Transcoder::_Decoder
+      def self?.decode: (HTTPX::Response response, ?bytesize: Integer | Float) -> Inflater
 
-      class Deflater < Transcoder::Deflater
+      class Error < ::HTTPX::Error
       end
 
-      module RequestBodyClassMethods
-        def initialize_deflater_body: (body_encoder body, Encoding | String encoding) -> body_encoder
+      class Deflater < Transcoder::Deflater
+        @compressor: ::Brotli::Compressor
       end
 
-      module ResponseBodyClassMethods
-        def initialize_inflater_by_encoding: (Encoding | String encoding, Response response, ?bytesize: Integer) -> (Transcoder::_Decoder | Transcoder::GZIP::Inflater)
+      class Inflater
+        @inflater: ::Brotli::Decompressor
+        @bytesize: Integer | Float
+
+        def initialize: (Integer | Float bytesize) -> void
+
+        def call: (String chunk) -> String
       end
     end
   end

data/sig/plugins/cookies/cookie.rbs

@@ -31,6 +31,8 @@ module HTTPX
       def cookie_value: () -> String
       alias to_s cookie_value
 
+      def match?: (String | cookie_attributes name_or_options) -> bool
+
       def valid_for_uri?: (http_uri uri) -> bool
 
       def self.new: (Cookie) -> instance
@@ -41,8 +43,7 @@ module HTTPX
 
       private
 
-      def initialize: (cookie_attributes) -> untyped
-                    | (_ToS, _ToS, ?cookie_attributes) -> untyped
+      def initialize: (_ToS name, _ToS value, ?cookie_attributes) -> void
 
       def acceptable_from_uri?: (uri) -> bool
 

data/sig/plugins/cookies/jar.rbs

@@ -6,11 +6,20 @@ module HTTPX
       include Enumerable[Cookie]
 
       @cookies: Array[Cookie]
+      @mtx: Thread::Mutex
 
       def parse: (String set_cookie) -> void
 
+      def get: (String | cookie_attributes name_or_options) -> Cookie?
+
+      def get_all: (String | cookie_attributes name_or_options) -> Array[Cookie]
+
+      def set: (_ToS | Cookie name, ?(cookie_attributes | _ToS) value_or_options) -> void
+
       def add: (Cookie name, ?String path) -> void
 
+      def delete: (String | Cookie | cookie_attributes name_or_options) -> void
+
       def []: (http_uri) -> Array[Cookie]
 
       def each: (?http_uri?) { (Cookie) -> void } -> void
@@ -21,6 +30,8 @@ module HTTPX
       private
 
       def initialize: (?_Each[cookie] cookies) -> untyped
+
+      def synchronize: [T] { () -> T } -> T
     end
   end
 end

data/sig/plugins/cookies.rbs

@@ -15,6 +15,8 @@ module HTTPX
 
       module InstanceMethods
         def cookies: () -> Jar
+
+        def make_jar: (*untyped) -> Jar
       end
 
       module HeadersMethods

data/sig/plugins/expect.rbs

@@ -2,14 +2,33 @@ module HTTPX
   module Plugins
     module Expect
       EXPECT_TIMEOUT: Integer
+      NOEXPECT_STORE_MUTEX: Thread::Mutex
+
+      self.@no_expect_store: Store
+      def self.no_expect_store: () -> Store
+
+      def self.extra_options: (Options) -> (Options & _ExpectOptions)
+
+      class Store
+        @store: Array[String]
+        @mutex: Thread::Mutex
+
+        def include?: (String host) -> bool
+
+        def add: (String host) -> void
+
+        def delete: (String host) -> void
+      end
+
+      module RequestMethods
+        @informational_status: Integer?
+      end
 
       interface _ExpectOptions
         def expect_timeout: () -> Integer?
 
         def expect_threshold_size: () -> Integer?
       end
-
-      def self.extra_options: (Options) -> (Options & _ExpectOptions)
     end
   end
 end

data/sig/plugins/fiber_concurrency.rbs

@@ -9,12 +9,12 @@ module HTTPX
 
         def set_context!: () -> void
 
-        def current_context?: () -> bool
+        def current_context?: () -> boolish
       end
 
       module ConnectionMethods
 
-        def current_context?: () -> bool
+        def current_context?: () -> boolish
 
         def send: (request request) -> void
       end

data/sig/plugins/proxy/socks4.rbs

@@ -5,6 +5,10 @@ module HTTPX
   module Plugins
     module Proxy
       module Socks4
+        VERSION: Integer
+        CONNECT: Integer
+        GRANTED: Integer
+        PROTOCOLS: Array[String]
 
         module ConnectionMethods
           def __socks4_proxy_connect: () ->  void

data/sig/plugins/rate_limiter.rbs

@@ -5,11 +5,11 @@ module HTTPX
 
       def self.load_dependencies: (singleton(Session)) -> void
 
-      def self.retry_after_rate_limit: (untyped, response) -> Numeric?
-
       module InstanceMethods
         def rate_limit_error?: (response response) -> bool
       end
     end
+
+    type sessionRateLimiter = Session & RateLimiter::InstanceMethods
   end
 end

data/sig/plugins/response_cache.rbs

@@ -51,7 +51,7 @@ module HTTPX
       module ResponseMethods
         attr_writer original_request: cacheRequest
 
-        @cache: bool
+        @cached: bool
         @cache_control: Array[String]?
         @vary: Array[String]?
         @date: Time?
@@ -66,9 +66,9 @@ module HTTPX
 
         def fresh?: () -> bool
 
-        def cache_control: () -> Array[String]?
+         %a{pure} def cache_control: () -> Array[String]?
 
-        def vary: () -> Array[String]?
+         %a{pure} def vary: () -> Array[String]?
 
         private
 

data/sig/plugins/retries.rbs

@@ -8,16 +8,16 @@ module HTTPX
       DEFAULT_JITTER: ^(Numeric) -> Numeric
       BACKOFF_ALGORITHMS: Array[Symbol]
 
-      def self?.retry_after_polynomial_backoff: (retriesRequest request, response response) -> Numeric
+      def self?.retry_after_polynomial_backoff: (retriesRequest request, retriesResponse response) -> Numeric
 
-      def self?.retry_after_exponential_backoff: (retriesRequest request, response response) -> Numeric
+      def self?.retry_after_exponential_backoff: (retriesRequest request, retriesResponse response) -> Numeric
 
       interface _RetryCallback
-        def call: (response response) -> bool?
+        def call: (retriesResponse response) -> bool?
       end
 
       interface _RetriesOptions
-        def retry_after: () -> (^(retriesRequest request, response response) -> Numeric | Numeric)?
+        def retry_after: () -> (^(retriesRequest request, retriesResponse response) -> Numeric | Numeric)?
 
         def retry_jitter: () -> ^(Numeric jitter) -> Numeric
 
@@ -35,17 +35,19 @@ module HTTPX
 
         private
 
-        def fetch_response: (retriesRequest request, Selector selector, retriesOptions options) -> (retriesResponse | ErrorResponse)?
+        def fetch_response: (retriesRequest request, Selector selector, retriesOptions options) -> retriesResponse?
 
-        def retryable_request?: (retriesRequest request, response response, retriesOptions options) -> boolish
+        def retryable_request?: (retriesRequest request, retriesResponse response, retriesOptions options) -> boolish
 
-        def retryable_response?: (response response, retriesOptions options) -> boolish
+        def retryable_response?: (retriesResponse response, retriesOptions options) -> boolish
 
         def retryable_error?: (_Exception error, Options options) -> boolish
 
-        def try_partial_retry: (retriesRequest request, (retriesResponse | ErrorResponse) response) -> void
+        def try_partial_retry: (retriesRequest request, retriesResponse response) -> void
 
-        def prepare_to_retry: (Request & RequestMethods request, response response) -> void
+        def prepare_to_retry: (Request & RequestMethods request, retriesResponse response) -> void
+
+        def when_to_retry: (Request & RequestMethods request, retriesResponse response, retriesOptions options) -> Numeric?
       end
 
       module RequestMethods
@@ -53,20 +55,22 @@ module HTTPX
 
         attr_accessor retries: Integer
 
-        attr_writer partial_response: Response?
+        attr_writer partial_response: retriesResponse?
 
-        def response=: (retriesResponse | ErrorResponse response) -> void
+        def response=: (retriesResponse response) -> void
       end
 
       module ResponseMethods
-        def from_partial_response: (Response response) -> void
+        def from_partial_response: (retriesHTTPResponse response) -> void
       end
 
       type retriesOptions = Options & _RetriesOptions
 
       type retriesRequest = Request & RequestMethods
 
-      type retriesResponse = Response & ResponseMethods
+      type retriesHTTPResponse = Response & ResponseMethods
+
+      type retriesResponse = retriesHTTPResponse | ErrorResponse
     end
 
     type sessionRetries = Session & Retries::InstanceMethods