httpx 1.7.0 → 1.7.2

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, *)

data/lib/httpx/transcoder/multipart.rb

@@ -19,7 +19,7 @@ module HTTPX::Transcoder
 
     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

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.7.0"
+  VERSION = "1.7.2"
 end

data/sig/altsvc.rbs

@@ -5,19 +5,22 @@ module HTTPX
 
       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?: (uri uri, uri other_uri) -> 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/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,6 +134,12 @@ 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
@@ -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.rbs

@@ -1,8 +1,10 @@
 module HTTPX
   module Plugins
     module Auth
+      type auth_header_value_type = String | ^(Request request) -> string
+
       interface _AuthOptions
-        def auth_header_value: () -> (String | ^(Request request) -> string)?
+        def auth_header_value: () -> auth_header_value_type?
 
         def auth_header_type: () -> String?
       end
@@ -22,13 +24,26 @@ module HTTPX
         private
 
         def generate_auth_token: () -> String?
+
+        def dynamic_auth_token?: (auth_header_value_type auth_header_value) -> boolish
       end
 
       module RequestMethods
+        @auth_token_value: String?
+
+        def authorized?: () -> bool
+
+        def unauthorize!: () -> void
+
         def authorize: (String auth_value) -> void
       end
 
       module AuthRetries
+        module InstanceMethods
+          private
+
+          def auth_error?: (response response, Options options) -> boolish
+        end
       end
     end
 

data/sig/plugins/oauth.rbs

@@ -87,8 +87,6 @@ module HTTPX
       end
 
       module OAuthRetries
-        def self?.response_oauth_error?: (response res) -> bool
-
         module InstanceMethods
         end
       end

data/sig/plugins/rate_limiter.rbs

@@ -5,9 +5,11 @@ module HTTPX
 
       def self.load_dependencies: (singleton(Session)) -> void
 
-      def self.retry_on_rate_limited_response?: (_Response) -> bool
-
       def self.retry_after_rate_limit: (untyped, response) -> Numeric?
+
+      module InstanceMethods
+        def rate_limit_error?: (response response) -> bool
+      end
     end
   end
 end

data/sig/plugins/retries.rbs

@@ -37,9 +37,11 @@ module HTTPX
 
         def fetch_response: (retriesRequest request, Selector selector, retriesOptions options) -> (retriesResponse | ErrorResponse)?
 
-        def repeatable_request?: (retriesRequest request, retriesOptions options) -> boolish
+        def retryable_request?: (retriesRequest request, response response, retriesOptions options) -> boolish
 
-        def retryable_error?: (_Exception error) -> bool
+        def retryable_response?: (response response, retriesOptions options) -> boolish
+
+        def retryable_error?: (_Exception error, Options options) -> boolish
 
         def try_partial_retry: (retriesRequest request, (retriesResponse | ErrorResponse) response) -> void
 

data/sig/plugins/stream_bidi.rbs

@@ -47,8 +47,11 @@ module HTTPX
         attr_accessor headers_sent: bool
 
         @closed: bool
+        @flush_buffer_on_body_cb: ^() -> void | nil
         @mutex: Thread::Mutex
 
+        def flush_buffer_on_body: { () -> void } -> void
+
         def closed?: () -> bool
       end
 

data/sig/resolver/cache/base.rbs

@@ -0,0 +1,28 @@
+module HTTPX
+  module Resolver
+    class Cache::Base
+      include _Cache
+
+      MAX_CACHE_SIZE: Integer
+
+      CACHE_MUTEX: Thread::Mutex
+      HOSTS: Resolv::Hosts
+
+      self.@cache: instance?
+
+      def self.cache: (Symbol label) -> instance
+
+      private
+
+      def ip_resolve: (String hostname) -> Array[Entry]?
+
+      def hosts_resolve: (String hostname) -> Array[Entry]?
+
+      def _get: (String hostname, Hash[String, Array[dns_result]] lookups, Array[String] hostnames, Numeric ttl) -> Array[Entry]?
+
+      def _set: (String hostname, ip_family family, Array[dns_result] entries, Hash[String, Array[dns_result]] lookups, Array[String] hostnames) -> void
+
+      def _evict: (String hostname, String ip, Hash[String, Array[dns_result]] lookups, Array[String] hostnames) -> void
+    end
+  end
+end

data/sig/resolver/cache/memory.rbs

@@ -0,0 +1,13 @@
+module HTTPX::Resolver
+  module Cache
+    class Memory < Base
+      @lookup_mutex: Thread::Mutex
+      @hostnames: Array[String]
+      @lookups: Hash[String, Array[dns_result]]
+
+      private
+
+      def synchronize: [U] () { (Hash[String, Array[dns_result]] lookups, Array[String] hostnames) -> U } -> U
+    end
+  end
+end

data/sig/resolver/cache.rbs

@@ -0,0 +1,16 @@
+module HTTPX
+  module Resolver
+    module Cache
+    end
+
+    interface _Cache
+      def resolve: (String hostname) -> Array[Entry]?
+
+      def get: (String hostname) -> Array[Entry]?
+
+      def set: (String hostname, ip_family family, Array[dns_result] addresses) -> void
+
+      def evict: (String hostname, _ToS ip) -> void
+    end
+  end
+end

data/sig/resolver/https.rbs

@@ -26,6 +26,25 @@ module HTTPX
 
       def <<: (Connection) -> void
 
+      # delegated to resolver connection
+      def connecting?: () -> bool
+
+      def to_io: () ->  IO
+
+      def call: () -> void
+
+      def close: () -> void
+
+      # def closed?: () -> bool
+
+      def deactivate: () -> void
+
+      def terminate: () -> void
+
+      def inflight?: () -> bool
+
+      def handle_socket_timeout: (Numeric interval) -> void
+
       private
 
       def initialize: (ip_family family, options options) -> void

data/sig/resolver/multi.rbs

@@ -20,6 +20,12 @@ module HTTPX
       def early_resolve: (Connection connection) -> bool
 
       def lazy_resolve: (Connection connection) -> void
+
+      private
+
+      def nolookup_resolve: (String hostname, Options options) -> Array[Entry]?
+
+      def initialize: (singleton(Native) | singleton(HTTPS) resolver_type, Options options) -> void
     end
   end
 end

data/sig/resolver.rbs

@@ -8,11 +8,7 @@ module HTTPX
                     | { "name" => String, "TTL" => Numeric, "data" => String }
 
     RESOLVE_TIMEOUT: Array[Integer]
-    MAX_CACHE_SIZE: Integer
 
-    self.@lookup_mutex: Thread::Mutex
-    self.@hostnames: Array[String]
-    self.@lookups: Hash[String, Array[dns_result]]
     self.@identifier_mutex: Thread::Mutex
     self.@identifier: Integer
     self.@hosts_resolver: Resolv::Hosts
@@ -20,24 +16,8 @@ module HTTPX
 
     type dns_decoding_response = [:ok, Array[dns_result]] | [:decode_error, Resolv::DNS::DecodeError] | [:retriable_error | :dns_error, Integer] | Symbol
 
-    def self?.nolookup_resolve: (String hostname) -> Array[Entry]?
-
-    def self?.ip_resolve: (String hostname) -> Array[Entry]?
-
-    def self?.hosts_resolve: (String hostname) -> Array[Entry]?
-
     def self?.supported_ip_families: () -> Array[ip_family]
 
-    def self?.resolver_for: (Symbol | singleton(Resolver) resolver_type, Options options) -> singleton(Resolver)
-
-    def self?.cached_lookup: (String hostname) -> Array[Entry]?
-
-    def self?.cached_lookup_set: (String hostname, ip_family family, Array[dns_result] addresses) -> void
-
-    def self?.cached_lookup_evict: (String hostname, _ToS ip) -> void
-
-    def self?.lookup: (String hostname, Hash[String, Array[dns_result]] lookups, Array[String] hostnames, Numeric ttl) -> Array[Entry]?
-
     def self?.generate_id: () -> Integer
 
     def self?.encode_dns_query: (String hostname, ?type: dns_resource, ?message_id: Integer) -> String
@@ -46,12 +26,8 @@ module HTTPX
 
     private
 
-    def self?.lookup_synchronize: [U] () { (Hash[String, Array[dns_result]] lookups, Array[String] hostnames) -> U } -> U
-
     def self?.id_synchronize: () { () -> void } -> void
 
-    def in_ractor?: () -> bool
-
     def find_supported_ip_families: () -> Array[Integer]
   end
 end

data/sig/timers.rbs

@@ -16,7 +16,7 @@ module HTTPX
 
     private
 
-    def drop_elapsed!: (?Numeric elapsed_time) -> void
+    def drop_elapsed!: (Numeric elapsed_time) -> void
 
     class Interval
       include Comparable

data/sig/utils.rbs

@@ -15,5 +15,7 @@ module HTTPX
     def self?.to_uri: (generic_uri uri) -> URI::Generic
 
     def self?.get_filename: (String header) -> String?
+
+    def self?.in_ractor?: () -> bool
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -160,6 +160,8 @@ extra_rdoc_files:
 - doc/release_notes/1_6_2.md
 - doc/release_notes/1_6_3.md
 - doc/release_notes/1_7_0.md
+- doc/release_notes/1_7_1.md
+- doc/release_notes/1_7_2.md
 files:
 - LICENSE.txt
 - README.md
@@ -292,6 +294,8 @@ files:
 - doc/release_notes/1_6_2.md
 - doc/release_notes/1_6_3.md
 - doc/release_notes/1_7_0.md
+- doc/release_notes/1_7_1.md
+- doc/release_notes/1_7_2.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb
@@ -373,6 +377,9 @@ files:
 - lib/httpx/request.rb
 - lib/httpx/request/body.rb
 - lib/httpx/resolver.rb
+- lib/httpx/resolver/cache.rb
+- lib/httpx/resolver/cache/base.rb
+- lib/httpx/resolver/cache/memory.rb
 - lib/httpx/resolver/entry.rb
 - lib/httpx/resolver/https.rb
 - lib/httpx/resolver/multi.rb
@@ -474,6 +481,9 @@ files:
 - sig/request.rbs
 - sig/request/body.rbs
 - sig/resolver.rbs
+- sig/resolver/cache.rbs
+- sig/resolver/cache/base.rbs
+- sig/resolver/cache/memory.rbs
 - sig/resolver/entry.rbs
 - sig/resolver/https.rbs
 - sig/resolver/multi.rbs