httpx 1.6.3 → 1.7.1

data/lib/httpx/session.rb

@@ -177,6 +177,7 @@ 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}" }
@@ -224,7 +225,7 @@ module HTTPX
 
     # tries deactivating connections in the +selector+, deregistering the ones that have been deactivated.
     def deactivate(selector)
-      selector.each_connection.each(&:deactivate)
+      selector.each_connection.to_a.each(&:deactivate)
     end
 
     # callback executed when an HTTP/2 promise frame has been received.
@@ -415,12 +416,12 @@ module HTTPX
 
     def find_resolver_for(connection, selector)
       if (resolver = selector.find_resolver(connection.options))
-        resolver.log(level: 2) { "found resolver##{connection.object_id}(#{connection.state}) in selector##{selector.object_id}" }
+        resolver.log(level: 2) { "found resolver##{resolver.object_id}(#{resolver.state}) in selector##{selector.object_id}" }
         return resolver
       end
 
       resolver = @pool.checkout_resolver(connection.options)
-      resolver.log(level: 2) { "found resolver##{connection.object_id}(#{connection.state}) in pool##{@pool.object_id}" }
+      resolver.log(level: 2) { "found resolver##{resolver.object_id}(#{resolver.state}) in pool##{@pool.object_id}" }
       pin(resolver, selector)
 
       resolver
@@ -436,14 +437,13 @@ module HTTPX
           conn1.log(level: 2) { "check-in connection##{conn1.object_id}(#{conn1.state}) in pool##{@pool.object_id}" }
           @pool.checkin_connection(conn1)
         end
-        return false
+        return
       end
 
       conn2.log(level: 2) { "coalescing with connection##{conn1.object_id}[#{conn1.origin}])" }
       select_connection(conn1, selector) if from_pool
       conn2.coalesce!(conn1)
       conn2.disconnect
-      true
     end
 
     def get_current_selector
@@ -472,6 +472,7 @@ module HTTPX
       th.thread_variable_get(:httpx_persistent_selector_store)
     end
 
+    Options.freeze
     @default_options = Options.new
     @default_options.freeze
     @plugins = []
@@ -493,7 +494,6 @@ module HTTPX
       #
       def plugin(pl, options = nil, &block)
         label = pl
-        # raise Error, "Cannot add a plugin to a frozen config" if frozen?
         pl = Plugins.load_plugin(pl) if pl.is_a?(Symbol)
         raise ArgumentError, "Invalid plugin type: #{pl.class.inspect}" unless pl.is_a?(Module)
 

data/lib/httpx/timers.rb

@@ -29,13 +29,15 @@ module HTTPX
     end
 
     def wait_interval
-      drop_elapsed!
-
       return if @intervals.empty?
 
+      first_interval = @intervals.first
+
+      drop_elapsed!(0) if first_interval.elapsed?(0)
+
       @next_interval_at = Utils.now
 
-      @intervals.first.interval
+      first_interval.interval
     end
 
     def fire(error = nil)
@@ -46,20 +48,12 @@ module HTTPX
 
       drop_elapsed!(elapsed_time)
 
-      @intervals = @intervals.drop_while { |interval| interval.elapse(elapsed_time) <= 0 }
-
       @next_interval_at = nil if @intervals.empty?
     end
 
     private
 
-    def drop_elapsed!(elapsed_time = 0)
-      # check first, if not elapsed, then return
-      first_interval = @intervals.first
-
-      return unless first_interval && first_interval.elapsed?(elapsed_time)
-
-      # TODO: would be nice to have a drop_while!
+    def drop_elapsed!(elapsed_time)
       @intervals = @intervals.drop_while { |interval| interval.elapse(elapsed_time) <= 0 }
     end
 

data/lib/httpx/transcoder/body.rb

@@ -12,7 +12,7 @@ module HTTPX::Transcoder
       def initialize(body)
         body = body.open(File::RDONLY, encoding: Encoding::BINARY) if Object.const_defined?(:Pathname) && body.is_a?(Pathname)
         @body = body
-        super(body)
+        super
       end
 
       def bytesize

data/lib/httpx/transcoder/gzip.rb

@@ -8,6 +8,7 @@ module HTTPX
       class Deflater < Transcoder::Deflater
         def initialize(body)
           @compressed_chunk = "".b
+          @deflater = nil
           super
         end
 
@@ -28,8 +29,12 @@ module HTTPX
 
         private
 
-        def write(chunk)
-          @compressed_chunk << chunk
+        def write(*chunks)
+          chunks.sum do |chunk|
+            chunk = chunk.to_s
+            @compressed_chunk << chunk
+            chunk.bytesize
+          end
         end
 
         def compressed_chunk

data/lib/httpx/transcoder/json.rb

@@ -64,7 +64,7 @@ module HTTPX::Transcoder
     else
       require "json"
       def json_load(*args); ::JSON.parse(*args); end
-      def json_dump(*args); ::JSON.dump(*args); end
+      def json_dump(*args); ::JSON.generate(*args); end
     end
     # rubocop:enable Style/SingleLineMethods
   end

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

@@ -12,7 +12,6 @@ module HTTPX
         def initialize(filename, content_type)
           @original_filename = filename
           @content_type = content_type
-          @current = nil
           @file = Tempfile.new("httpx", encoding: Encoding::BINARY, mode: File::RDWR)
           super(@file)
         end
@@ -39,6 +38,7 @@ module HTTPX
           @parts = {}
           @intermediate_boundary = "--#{@boundary}"
           @state = :idle
+          @current = nil
         end
 
         def call(response, *)
@@ -60,7 +60,7 @@ module HTTPX
           when :idle
             raise Error, "payload does not start with boundary" unless @buffer.start_with?("#{@intermediate_boundary}#{CRLF}")
 
-            @buffer = @buffer.byteslice(@intermediate_boundary.bytesize + 2..-1)
+            @buffer = @buffer.byteslice((@intermediate_boundary.bytesize + 2)..-1)
 
             @state = :part_header
           when :part_header
@@ -70,7 +70,7 @@ module HTTPX
             return unless idx
 
             # @type var head: String
-            head = @buffer.byteslice(0..idx + 4 - 1)
+            head = @buffer.byteslice(0..(idx + 4 - 1))
 
             @buffer = @buffer.byteslice(head.bytesize..-1)
 
@@ -107,8 +107,8 @@ module HTTPX
             idx = @buffer.index(body_separator)
 
             if idx
-              payload = @buffer.byteslice(0..idx - 1)
-              @buffer = @buffer.byteslice(idx + body_separator.bytesize..-1)
+              payload = @buffer.byteslice(0..(idx - 1))
+              @buffer = @buffer.byteslice((idx + body_separator.bytesize)..-1)
               part << payload
               part.rewind if part.respond_to?(:rewind)
               @state = :parse_boundary

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

@@ -53,7 +53,7 @@ module HTTPX
 
       def to_parts(form)
         params = form.each_with_object([]) do |(key, val), aux|
-          Transcoder.normalize_keys(key, val, MULTIPART_VALUE_COND) do |k, v|
+          Transcoder::Multipart.normalize_keys(key, val) do |k, v|
             next if v.nil?
 
             value, content_type, filename = Part.call(v)

data/lib/httpx/transcoder/multipart.rb

@@ -7,20 +7,28 @@ require_relative "multipart/mime_type_detector"
 
 module HTTPX::Transcoder
   module Multipart
-    MULTIPART_VALUE_COND = lambda do |value|
+    module_function
+
+    def multipart?(form_data)
+      form_data.any? do |_, v|
+        multipart_value?(v) ||
+          (v.respond_to?(:to_ary) && v.to_ary.any? { |av| multipart_value?(av) }) ||
+          (v.respond_to?(:to_hash) && v.to_hash.any? { |_, e| multipart_value?(e) })
+      end
+    end
+
+    def multipart_value?(value)
       value.respond_to?(:read) ||
-        (value.respond_to?(:to_hash) &&
+        (value.is_a?(Hash) &&
           value.key?(:body) &&
           (value.key?(:filename) || value.key?(:content_type)))
     end
 
-    module_function
-
-    def multipart?(form_data)
-      form_data.any? do |_, v|
-        Multipart::MULTIPART_VALUE_COND.call(v) ||
-          (v.respond_to?(:to_ary) && v.to_ary.any?(&Multipart::MULTIPART_VALUE_COND)) ||
-          (v.respond_to?(:to_hash) && v.to_hash.any? { |_, e| Multipart::MULTIPART_VALUE_COND.call(e) })
+    def normalize_keys(key, value, transcoder = self, &block)
+      if multipart_value?(value)
+        block.call(key.to_s, value)
+      else
+        HTTPX::Transcoder.normalize_keys(key, value, transcoder, &block)
       end
     end
 

data/lib/httpx/transcoder.rb

@@ -4,20 +4,18 @@ module HTTPX
   module Transcoder
     module_function
 
-    def normalize_keys(key, value, cond = nil, &block)
-      if cond && cond.call(value)
-        block.call(key.to_s, value)
-      elsif value.respond_to?(:to_ary)
+    def normalize_keys(key, value, transcoder = self, &block)
+      if value.respond_to?(:to_ary)
         if value.empty?
           block.call("#{key}[]")
         else
           value.to_ary.each do |element|
-            normalize_keys("#{key}[]", element, cond, &block)
+            transcoder.normalize_keys("#{key}[]", element, transcoder, &block)
           end
         end
       elsif value.respond_to?(:to_hash)
         value.to_hash.each do |child_key, child_value|
-          normalize_keys("#{key}[#{child_key}]", child_value, cond, &block)
+          transcoder.normalize_keys("#{key}[#{child_key}]", child_value, transcoder, &block)
         end
       else
         block.call(key.to_s, value)

data/lib/httpx/utils.rb

@@ -71,5 +71,18 @@ module HTTPX
       uri.non_ascii_hostname = non_ascii_hostname
       uri
     end
+
+    if defined?(Ractor) &&
+       # no ractor support for 3.0
+       RUBY_VERSION >= "3.1.0"
+
+      def in_ractor?
+        Ractor.main != Ractor.current
+      end
+    else
+      def in_ractor?
+        false
+      end
+    end
   end
 end

data/lib/httpx/version.rb

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

data/sig/altsvc.rbs

@@ -1,20 +1,26 @@
 module HTTPX
   module AltSvc
     module ConnectionMixin
+      H2_ALTSVC_SCHEMES: Array[String]
 
       def send: (Request request) -> void
 
-      def match?: (URI::Generic uri, Options options) -> bool
+      def match?: (http_uri uri, Options options) -> bool
 
       private
 
-      def match_altsvcs?: (URI::Generic uri) -> bool
+      def match_altsvcs?: (http_uri uri) -> bool
 
-      def match_altsvc_options?: (URI::Generic uri, Options options) -> bool
+      def match_altsvc_options?: (http_uri uri, Options options) -> bool
+
+      def altsvc_match?: (http_uri uri, uri other_uri) -> bool
     end
 
     type altsvc_params = Hash[String, untyped]
 
+    self.@altsvc_mutex: Thread::Mutex
+    self.@altsvcs: Hash[String, Array[altsvc_params]]
+
     def self?.cached_altsvc: (String origin) -> Array[altsvc_params]
 
     def self?.cached_altsvc_set: (String origin, altsvc_params) -> void

data/sig/chainable.rbs

@@ -1,7 +1,7 @@
 module HTTPX
   module Chainable
-    def request: (*Request, **untyped) -> Array[response]
-               | (Request, **untyped) -> response
+    def request: (Request, **untyped) -> response
+               | (*Request, **untyped) -> Array[response]
                | (verb, uri | [uri], **untyped) -> response
                | (Array[[verb, uri] | [verb, uri, request_params]], **untyped) -> Array[response]
                | (verb, _Each[uri | [uri, request_params]], **untyped) -> Array[response]
@@ -12,7 +12,7 @@ module HTTPX
     def with: (options) -> Session
             | (options) { (Session) -> void } -> void
 
-    def plugin: (:auth, ?options) -> Plugins::sessionAuthorization
+    def plugin: (:auth, ?options) -> Plugins::sessionAuth
               | (:basic_auth, ?options) -> Plugins::sessionBasicAuth
               | (:digest_auth, ?options) -> Plugins::sessionDigestAuth
               | (:ntlm_auth, ?options) -> Plugins::sessionNTLMAuth

data/sig/connection.rbs

@@ -61,7 +61,7 @@ module HTTPX
 
     def addresses?: () -> boolish
 
-    def match?: (URI::Generic uri, Options options) -> bool
+    def match?: (http_uri uri, Options options) -> bool
 
     def mergeable?: (Connection connection) -> bool
 
@@ -71,8 +71,6 @@ module HTTPX
 
     def coalescable?: (Connection connection) -> bool
 
-    def create_idle: (?Hash[Symbol, untyped] options) -> instance
-
     def merge: (Connection connection) -> void
 
     def purge_pending: () { (Request request) -> void } -> void

data/sig/loggable.rbs

@@ -4,7 +4,7 @@ module HTTPX
   end
 
   module Loggable
-    USE_DEBUG_LOGS: bool
+    USE_DEBUG_LOG: bool
 
     COLORS: Hash[Symbol, Integer]
 

data/sig/options.rbs

@@ -17,11 +17,13 @@ module HTTPX
 
     DEFAULT_OPTIONS: Hash[Symbol, untyped]
     REQUEST_BODY_IVARS: Array[Symbol]
+    RESOLVER_TYPES: Array[Symbol]
     USER_AGENT: String
 
     type timeout_type = :connect_timeout | :settings_timeout | :close_handshake_timeout | :operation_timeout | :keep_alive_timeout | :read_timeout | :write_timeout | :request_timeout
     type timeout = Hash[timeout_type, Numeric?]
     type redact_value = :headers | :body | bool
+    type resolver_cache_option = :memory | :file | (Object & Resolver::_Cache)
 
     def self.new: (?options) -> instance
 
@@ -102,8 +104,6 @@ module HTTPX
 
     attr_reader options_class: singleton(Options)
 
-    attr_reader resolver_class: Symbol | singleton(Resolver::Resolver)
-
     attr_reader ssl: Hash[Symbol, untyped]
 
     # io
@@ -134,11 +134,17 @@ module HTTPX
     # ip_families
     attr_reader ip_families: Array[ip_family]?
 
+    @resolver_cache: resolver_cache_option
+
+    def resolver_class: () -> singleton(Resolver::Resolver)
+
+    def resolver_cache: () -> (Object & Resolver::_Cache)
+
     def ==: (Options other) -> bool
 
     def options_equals?: (Options other, ?Array[Symbol] ignore_ivars) -> bool
 
-    def merge: (_ToHash[Symbol, untyped] other) -> instance
+    def merge: (Object & _ToHash[Symbol, untyped] other) -> (instance | self)
 
     def to_hash: () -> Hash[Symbol, untyped]
 
@@ -148,7 +154,7 @@ module HTTPX
 
     def initialize: (?options options) -> void
 
-    def do_initialize: (?options options) -> void
+    def do_initialize: () -> void
 
     def access_option: (Hash[Symbol, untyped] | Object | nil obj, Symbol k, Hash[Symbol, Symbol]? ivar_map) -> untyped
 
@@ -185,6 +191,8 @@ module HTTPX
     def option_persistent: (bool value) -> bool
     def option_close_on_fork: (bool value) -> bool
 
+    def option_resolver_cache: (resolver_cache_option value) -> resolver_cache_option
+
     def option_origin: (http_uri | String value) -> http_uri
 
     def option_base_path: (_ToStr value) -> String

data/sig/plugins/auth/digest.rbs

@@ -2,9 +2,13 @@ module HTTPX
   module Plugins
     module Authentication
       class Digest
+        Error: singleton(HTTPX::Error)
+
+
         @user: String
         @password: String
         @hashed: bool
+        @nonce: Integer
 
         def can_authenticate?: (String? authenticate) -> boolish
 
@@ -19,6 +23,8 @@ module HTTPX
         def make_cnonce: () -> String
 
         def next_nonce: () -> Integer
+
+        def raise_format_error: () -> void
       end
     end
   end

data/sig/plugins/auth.rbs

@@ -1,13 +1,46 @@
 module HTTPX
   module Plugins
-    module Authorization
+    module Auth
+      type auth_header_value_type = String | ^(Request request) -> string
+
+      interface _AuthOptions
+        def auth_header_value: () -> auth_header_value_type?
+
+        def auth_header_type: () -> String?
+      end
+
       module InstanceMethods
-        def authorization: (string token) -> instance
+        @auth_header_value: String
+        @skip_auth_header_value: bool
+
+        def authorization: (?string token, ?auth_header_type: string) ?{ (Request) -> string } -> instance
+
+        def bearer_auth: (?string token) ?{ (Request) -> string } -> instance
+
+        def skip_auth_header: [T] { () -> T } -> T
+
+        def reset_auth_header_value!: () -> void
+
+        private
+
+        def generate_auth_token: () -> String?
+
+        def dynamic_auth_token?: (auth_header_value_type auth_header_value) -> boolish
+      end
+
+      module RequestMethods
+        def authorize: (String auth_value) -> void
+      end
+
+      module AuthRetries
+        module InstanceMethods
+          private
 
-        def bearer_auth: (string token) -> instance
+          def auth_error?: (response response, Options options) -> boolish
+        end
       end
     end
 
-    type sessionAuthorization = Session & Authorization::InstanceMethods
+    type sessionAuth = Session & Auth::InstanceMethods
   end
 end

data/sig/plugins/basic_auth.rbs

@@ -1,15 +1,15 @@
 module HTTPX
   module Plugins
     module BasicAuth
-      def self.load_dependencies: (singleton(Session)) -> void
+      def self.load_dependencies: (singleton(Session) klass) -> void
 
-      def self.configure: (singleton(Session)) -> void
+      def self.configure: (singleton(Session) klass) -> void
 
       module InstanceMethods
         def basic_auth: (string user, string password) -> instance
       end
     end
 
-    type sessionBasicAuth = sessionAuthorization & BasicAuth::InstanceMethods
+    type sessionBasicAuth = sessionAuth & BasicAuth::InstanceMethods
   end
 end

data/sig/plugins/digest_auth.rbs

@@ -1,21 +1,19 @@
 module HTTPX
   module Plugins
     module DigestAuth
-      DigestError: singleton(Error)
-
       interface _DigestOptions
         def digest: () -> Authentication::Digest?
       end
 
       def self.extra_options: (Options) -> (Options & _DigestOptions)
 
-      def self.load_dependencies: (*untyped) -> void
+      def self.load_dependencies: (singleton(Session) klass) -> void
 
       module InstanceMethods
         def digest_auth: (string user, string password, ?hashed: bool) -> instance
       end
     end
 
-    type sessionDigestAuth = sessionAuthorization & DigestAuth::InstanceMethods
+    type sessionDigestAuth = sessionAuth & DigestAuth::InstanceMethods
   end
 end

data/sig/plugins/fiber_concurrency.rbs

@@ -43,6 +43,12 @@ module HTTPX
         end
       end
 
+       module FiberConcurrencyStream
+        module StreamResponseMethods
+          def close: () -> void
+        end
+      end
+
       type request = Request & RequestMethods
     end
 

data/sig/plugins/ntlm_auth.rbs

@@ -8,7 +8,7 @@ module HTTPX
 
       def self.extra_options: (Options) -> (Options & _NTLMOptions)
 
-      def self.load_dependencies: (*untyped) -> void
+      def self.load_dependencies: (singleton(Session) klass) -> void
 
       module InstanceMethods
         def ntlm_auth: (string user, string password, ?string? domain) -> instance
@@ -16,6 +16,6 @@ module HTTPX
 
     end
 
-    type sessionNTLMAuth = sessionAuthorization & NTLMAuth::InstanceMethods
+    type sessionNTLMAuth = sessionAuth & NTLMAuth::InstanceMethods
   end
 end