httpx 1.6.3 → 1.7.1

data/sig/plugins/oauth.rbs

@@ -15,19 +15,18 @@ module HTTPX
       SUPPORTED_AUTH_METHODS: ::Array[token_auth_method]
 
       class OAuthSession
-        attr_reader grant_type: grant_type
-
-        attr_reader client_id: String
-
-        attr_reader client_secret: String
-
         attr_reader access_token: String?
 
         attr_reader refresh_token: String?
 
-        attr_reader scope: Array[String]?
-
-        attr_reader audience: String?
+        @issuer: http_uri
+        @grant_type: grant_type
+        @client_id: String
+        @client_secret: String
+        @token_endpoint: http_uri?
+        @scope: Array[String]?
+        @audience: String?
+        @token_endpoint_auth_method: String?
 
         def initialize: (
           issuer: uri,
@@ -37,32 +36,62 @@ module HTTPX
           ?refresh_token: String?,
           ?scope: (Array[String] | String)?,
           ?token_endpoint: String?,
-          ?response_type: String?,
           ?grant_type: String?,
           ?token_endpoint_auth_method: ::String,
           ?audience: ::String
         ) -> void
 
-        def token_endpoint: () -> String
+        def token_endpoint: () -> uri
+
+        def token_endpoint_auth_method: () -> String
 
-        def token_endpoint_auth_method: () -> token_auth_method
+        def reset!: () -> void
 
-        def load: (Session http) -> void
+        def fetch_access_token: (sessionOAuth http) -> String
 
         def merge: (instance | Hash[untyped, untyped] other) -> instance
+
+        private
+
+
+        def load: (sessionOAuth http) -> void
       end
 
-      interface _AwsSdkOptions
+      interface _OAuthOptions
         def oauth_session: () -> OAuthSession?
+
+        def oauth_options: () -> {
+          issuer: uri,
+          client_id: String,
+          client_secret: String,
+          ?access_token: String?,
+          ?refresh_token: String?,
+          ?scope: (Array[String] | String)?,
+          ?token_endpoint: String?,
+          ?response_type: String?,
+          ?grant_type: String?,
+          ?token_endpoint_auth_method: ::String,
+          ?audience: ::String
+        }?
       end
 
       module InstanceMethods
+        attr_reader oauth_session: OAuthSession
+        @options: Options & _OAuthOptions
+
         def oauth_auth: (**untyped args) -> instance
 
         def with_access_token: () -> instance
+
+        def refresh_oauth_tokens!: () -> void
+      end
+
+      module OAuthRetries
+        module InstanceMethods
+        end
       end
     end
 
-    type sessionOAuth = Session & OAuth::InstanceMethods
+    type sessionOAuth = Session & Auth::InstanceMethods & OAuth::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/response_cache/file_store.rbs

@@ -2,6 +2,8 @@ module HTTPX
   module Plugins
     module ResponseCache
       class FileStore
+        CRLF: String
+
         @dir: Pathname
 
         include _ResponseCacheStore

data/sig/plugins/response_cache.rbs

@@ -39,6 +39,7 @@ module HTTPX
 
       module RequestMethods
         attr_accessor cached_response: cacheResponse?
+        attr_reader options: cacheOptions
 
         @response_cache_key: String
 
@@ -51,6 +52,9 @@ module HTTPX
         attr_writer original_request: cacheRequest
 
         @cache: bool
+        @cache_control: Array[String]?
+        @vary: Array[String]?
+        @date: Time?
 
         def original_request: () -> cacheRequest?
 

data/sig/plugins/retries.rbs

@@ -6,13 +6,18 @@ module HTTPX
       RECONNECTABLE_ERRORS: Array[singleton(StandardError)]
       RETRYABLE_ERRORS: Array[singleton(StandardError)]
       DEFAULT_JITTER: ^(Numeric) -> Numeric
+      BACKOFF_ALGORITHMS: Array[Symbol]
+
+      def self?.retry_after_polynomial_backoff: (retriesRequest request, response response) -> Numeric
+
+      def self?.retry_after_exponential_backoff: (retriesRequest request, response response) -> Numeric
 
       interface _RetryCallback
         def call: (response response) -> bool?
       end
 
       interface _RetriesOptions
-        def retry_after: () -> Numeric?
+        def retry_after: () -> (^(retriesRequest request, response response) -> Numeric | Numeric)?
 
         def retry_jitter: () -> ^(Numeric jitter) -> Numeric
 
@@ -32,16 +37,19 @@ 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_response?: (response response, retriesOptions options) -> boolish
 
-        def retryable_error?: (_Exception error) -> bool
+        def retryable_error?: (_Exception error, Options options) -> boolish
 
         def try_partial_retry: (retriesRequest request, (retriesResponse | ErrorResponse) response) -> void
 
+        def prepare_to_retry: (Request & RequestMethods request, response response) -> void
       end
 
       module RequestMethods
-        @options: Options & _RetriesOptions
+        attr_reader options: retriesOptions
 
         attr_accessor retries: Integer
 

data/sig/plugins/stream.rbs

@@ -1,11 +1,21 @@
 module HTTPX
   module Plugins
     module Stream
+      STREAM_REQUEST_OPTIONS: Hash[Symbol, untyped]
+
+      interface _StreamOptions
+        def stream: () -> boolish
+
+        def retry_stream_response_class: () -> singleton(StreamResponse)
+      end
+
       module InstanceMethods
+        @options: Options & _StreamOptions
+
         private
 
-        def request: (*Request, ?stream: bool, **untyped?) -> (response | Array[response] | StreamResponse)
-                   | (*untyped, ?stream: bool, **untyped?) -> (response | Array[response] | StreamResponse)
+        def request: (*Request, **untyped?) -> (response | Array[response] | StreamResponse)
+                   | (*untyped, **untyped?) -> (response | Array[response] | StreamResponse)
       end
 
       module RequestMethods
@@ -30,7 +40,7 @@ module HTTPX
     type streamRequest = Request & Plugins::Stream::RequestMethods
 
     attr_reader request: streamRequest
-    @options: Options
+    @options: Options & _StreamOptions
 
     @session: Plugins::sessionStream
     @response_enum: Enumerator[String]?

data/sig/plugins/stream_bidi.rbs

@@ -16,7 +16,7 @@ module HTTPX
       end
 
       class BidiBuffer < Buffer
-        @parent_thread: Thread
+        @buffer_mutex: Thread::Mutex
         @oob_mutex: Thread::Mutex
         @oob_buffer: String
 
@@ -34,7 +34,7 @@ module HTTPX
 
         def wakeup: () -> void
 
-        def mergeable?: () -> bool
+        def inflight?: () -> bool
 
         def terminate: () -> void
       end

data/sig/pool.rbs

@@ -15,7 +15,7 @@ module HTTPX
     @options: Options
     @resolvers: Hash[Class, Array[resolver_manager]]
     @resolver_mtx: Thread::Mutex
-    @connections: Hash[String, Array[Connection]]
+    @connections: Array[Connection]
     @connection_mtx: Thread::Mutex
     @connections_counter: Integer
     @max_connections_cond: ConditionVariable

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

@@ -11,11 +11,14 @@ module HTTPX
       attr_reader family: ip_family
 
       @options: Options
+      @_timeouts: Array[Numeric]
+      @timeouts: Hash[String, Array[Numeric]]
       @queries: Hash[String, Connection]
       @requests: Hash[Request, String]
       @connections: Array[Connection]
       @uri: http_uri
       @uri_addresses: Array[String]?
+      @name: String?
       @resolver: Resolv::DNS
       @resolver_connection: Connection
 
@@ -23,12 +26,33 @@ 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
 
       def resolver_connection: () -> Connection
 
+      def send_request: (String hostname, Connection connection) -> void
+
       def on_response: (Request, response) -> void
 
       def parse: (Request request, Response response) -> void

data/sig/resolver/multi.rbs

@@ -9,6 +9,8 @@ module HTTPX
       @current_session: Session?
       @resolver_options: Hash[Symbol, untyped]
 
+      def state: () -> String
+
       def current_selector=: (Selector s) -> void
 
       def current_session=: (Session s) -> void
@@ -18,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/native.rbs

@@ -64,6 +64,8 @@ module HTTPX
 
       def transition: (Symbol nextstate) -> void
 
+      def reset_query: () -> void
+
       def reset_hostname: (String hostname, ?connection: Connection, ?reset_candidates: bool) -> void
 
       def close_or_resolve: () -> void

data/sig/resolver.rbs

@@ -9,40 +9,25 @@ module HTTPX
 
     RESOLVE_TIMEOUT: Array[Integer]
 
-    self.@lookup_mutex: Thread::Mutex
-    self.@lookups: Hash[String, Array[dns_result]]
     self.@identifier_mutex: Thread::Mutex
     self.@identifier: Integer
     self.@hosts_resolver: Resolv::Hosts
+    self.@supported_ip_families: Array[Integer]
 
-    type dns_decoding_response = [:ok, Array[dns_result]] | [:decode_error, Resolv::DNS::DecodeError] | [: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]?
+    type dns_decoding_response = [:ok, Array[dns_result]] | [:decode_error, Resolv::DNS::DecodeError] | [:retriable_error | :dns_error, Integer] | Symbol
 
     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, Numeric ttl) -> Array[Entry]?
-
     def self?.generate_id: () -> Integer
 
     def self?.encode_dns_query: (String hostname, ?type: dns_resource, ?message_id: Integer) -> String
 
     def self?.decode_dns_answer: (String) -> dns_decoding_response
 
-    def self?.lookup_synchronize: [U] () { (Hash[String, Array[dns_result]] lookups) -> U } -> U
+    private
 
     def self?.id_synchronize: () { () -> void } -> void
+
+    def find_supported_ip_families: () -> Array[Integer]
   end
 end

data/sig/response.rbs

@@ -63,6 +63,7 @@ module HTTPX
     @header_value: String?
     @mime_type: String?
     @charset: String?
+    @initialized: bool
 
     def mime_type: () -> String?
 
@@ -71,6 +72,8 @@ module HTTPX
     private
 
     def initialize: (String? header_value) -> void
+
+    def load: () -> void
   end
 
   class ErrorResponse

data/sig/session.rbs

@@ -55,10 +55,8 @@ module HTTPX
     def set_request_callbacks: (Request request) -> void
 
     def build_requests: (verb, uri, request_params) -> Array[Request]
-                      | (Array[[verb, uri, request_params]], Hash[Symbol, untyped]) -> Array[Request]
-                      | (Array[[verb, uri]], request_params) -> Array[Request]
-                      | (verb, _Each[[uri, request_params]], Hash[Symbol, untyped]) -> Array[Request]
-                      | (verb, _Each[uri], request_params) -> Array[Request]
+                      | (Array[[verb, uri] | [verb, uri, request_params]], ?request_params) -> Array[Request]
+                      | (verb, _Each[[uri] | [uri, request_params]], request_params) -> Array[Request]
 
     def do_init_connection: (Connection connection, Selector selector) -> void
 
@@ -76,7 +74,7 @@ module HTTPX
 
     def find_resolver_for: (Connection connection, Selector selector) -> resolver
 
-    def coalesce_connections: (Connection conn1, Connection conn2, Selector selector, bool from_pool) -> bool
+    def coalesce_connections: (Connection conn1, Connection conn2, Selector selector, bool from_pool) -> void
 
     def get_current_selector: () -> Selector?
                             | () { () -> Selector } -> Selector

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/transcoder/multipart.rbs

@@ -7,8 +7,6 @@ module HTTPX
         def read: (?int? length, ?string? output) -> String?
       end
 
-      MULTIPART_VALUE_COND: ^(_Reader | record_multipart_value value) -> bool
-
       type multipart_value = string | Pathname | File | Tempfile | _Reader
 
       type record_multipart_value = { content_type: String, filename: String, body: multipart_value } |
@@ -22,6 +20,10 @@ module HTTPX
 
       def self?.multipart?: (form_nested_value | multipart_nested_value form_data) -> bool
 
+      def self?.multipart_value?: (multipart_nested_value value) -> bool
+
+      def self?.normalize_keys: [U] (_ToS key, _ToAry[untyped] | _ToHash[_ToS, untyped] | untyped value, ?_KeyNormalizer transcoder) { (String, ?untyped) -> U } -> U
+
       class Encoder
         @boundary: String
         @part_index: Integer

data/sig/transcoder.rbs

@@ -3,8 +3,12 @@ module HTTPX
 
   type body_encoder = (Transcoder::_Encoder & _ToS) | (Transcoder::_Encoder & _Reader) | (Transcoder::_Encoder & _Each[String])
 
+  interface _KeyNormalizer
+    def normalize_keys: [U] (_ToS key, _ToAry[untyped] | _ToHash[_ToS, untyped] | untyped value, ?_KeyNormalizer transcoder) { (String, ?untyped) -> U } -> U
+  end
+
   module Transcoder
-    def self?.normalize_keys: [U] (_ToS key, _ToAry[untyped] | _ToHash[_ToS, untyped] | untyped value, ?(^(untyped value) -> bool | nil) cond) { (String, ?untyped) -> U } -> U
+    def self?.normalize_keys: [U] (_ToS key, _ToAry[untyped] | _ToHash[_ToS, untyped] | untyped value, ?_KeyNormalizer transcoder) { (String, ?untyped) -> U } -> U
 
     def self?.normalize_query: (Hash[String, untyped] params, String name, String v, Integer depth) -> void
 

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.6.3
+  version: 1.7.1
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -159,6 +159,8 @@ extra_rdoc_files:
 - doc/release_notes/1_6_1.md
 - 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
 files:
 - LICENSE.txt
 - README.md
@@ -290,6 +292,8 @@ files:
 - doc/release_notes/1_6_1.md
 - 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
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb
@@ -371,6 +375,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
@@ -472,6 +479,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