httpx 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5ee54988be76a44ae512da359d83c502f8a43073f244a116a8fdc45fa7b87d
-  data.tar.gz: e3c08652a8d08eadbd1ef14b20005f93ff4131a712f8234c3eab94c7fce07167
+  metadata.gz: 7aff2acc77577cb1243c30a63766f404755131c2f1b19162b9b6ba13c49d61f8
+  data.tar.gz: 6297b0857edce0f5d93a0272c2b5e891257969c36cbf0c34c6a7ca6e4a5ced67
 SHA512:
-  metadata.gz: 58f16e523d23215d89a8c873a5ce12491b52726073c334c4d9800e17e40dca8111ad43ab2467c37939a19bebbaa000c8db144fdbba87cc3d22cb699687df6699
-  data.tar.gz: 64dd9bb70af4173339019b62fa9f54fdf3f22c4bf593b51fb3de624844ac8a599a51b49cae10623aee8b8cff24af4dee69e39bedfec7da3d1ae229d733632e9c
+  metadata.gz: 94da91dd14a8318e8f0a0199214f97c008b927c7b8d9f602f045434bbd375b4446c767ed805e424d826c3dc48e90a8a0fded192858d32763c4c38033e0107cae
+  data.tar.gz: 657cefe9a977ca56dddda02bbdb07a94b4a8f158193e5f0d695c254bdbcafd95ffccd29641d38958d16468a81fd236f4d95ef4487c335cf7e079fb29b8d456ba

data/doc/release_notes/1_2_2.md

@@ -0,0 +1,10 @@
+# 1.2.2
+
+## Bugfixes
+
+* only raise "unknown option" error when option is not supported, not anymore when error happens in the setup of a support option.
+* usage of `HTTPX::Session#wrap` within a thread with other sessions using the `:persistent` plugin won't inadvertedly terminate its open connections.
+* terminate connections on `IOError` (`SocketError` does not cover them).
+* terminate connections on HTTP/2 protocol and handshake errors, which happen during establishment or termination of a HTTP/2 connection (they were being previously kept around, although they'd irrecoverable).
+* `:oauth` plugin: fixing check preventing the OAuth metadata server integration path to be exercised.
+* fix instantiation of the options headers object with the wrong headers class.

data/lib/httpx/connection.rb

@@ -522,14 +522,15 @@ module HTTPX
            Errno::ENETUNREACH,
            Errno::EPIPE,
            Errno::ENOENT,
-           SocketError => e
+           SocketError,
+           IOError => e
       # connect errors, exit gracefully
       error = ConnectionError.new(e.message)
       error.set_backtrace(e.backtrace)
       connecting? && callbacks_for?(:connect_error) ? emit(:connect_error, error) : handle_error(error)
       @state = :closed
       emit(:close)
-    rescue TLSError => e
+    rescue TLSError, HTTP2Next::Error::ProtocolError, HTTP2Next::Error::HandshakeError => e
       # connect errors, exit gracefully
       handle_error(e)
       connecting? && callbacks_for?(:connect_error) ? emit(:connect_error, e) : handle_error(e)

data/lib/httpx/io/tcp.rb

@@ -78,7 +78,8 @@ module HTTPX
     rescue Errno::ECONNREFUSED,
            Errno::EADDRNOTAVAIL,
            Errno::EHOSTUNREACH,
-           SocketError => e
+           SocketError,
+           IOError => e
       raise e if @ip_index <= 0
 
       log { "failed connecting to #{@ip} (#{e.message}), trying next..." }

data/lib/httpx/options.rb

@@ -47,13 +47,13 @@ module HTTPX
         write_timeout: WRITE_TIMEOUT,
         request_timeout: REQUEST_TIMEOUT,
       },
+      :headers_class => Class.new(Headers),
       :headers => {},
       :window_size => WINDOW_SIZE,
       :buffer_size => BUFFER_SIZE,
       :body_threshold_size => MAX_BODY_THRESHOLD_SIZE,
       :request_class => Class.new(Request),
       :response_class => Class.new(Response),
-      :headers_class => Class.new(Headers),
       :request_body_class => Class.new(Request::Body),
       :response_body_class => Class.new(Response::Body),
       :connection_class => Class.new(Connection),
@@ -154,7 +154,7 @@ module HTTPX
     end
 
     def option_headers(value)
-      Headers.new(value)
+      headers_class.new(value)
     end
 
     def option_timeout(value)
@@ -342,12 +342,11 @@ module HTTPX
       defaults.each do |k, v|
         next if v.nil?
 
-        begin
-          value = __send__(:"option_#{k}", v)
-          instance_variable_set(:"@#{k}", value)
-        rescue NoMethodError
-          raise Error, "unknown option: #{k}"
-        end
+        option_method_name = :"option_#{k}"
+        raise Error, "unknown option: #{k}" unless respond_to?(option_method_name)
+
+        value = __send__(option_method_name, v)
+        instance_variable_set(:"@#{k}", value)
       end
     end
   end

data/lib/httpx/plugins/oauth.rb

@@ -60,9 +60,9 @@ module HTTPX
         end
 
         def load(http)
-          return unless @token_endpoint && @token_endpoint_auth_method && @grant_type && @scope
+          return if @token_endpoint_auth_method && @grant_type && @scope
 
-          metadata = http.get("#{issuer}/.well-known/oauth-authorization-server").raise_for_status.json
+          metadata = http.get("#{@issuer}/.well-known/oauth-authorization-server").raise_for_status.json
 
           @token_endpoint = metadata["token_endpoint"]
           @scope = metadata["scopes_supported"]
@@ -70,6 +70,7 @@ module HTTPX
           @token_endpoint_auth_method = Array(metadata["token_endpoint_auth_methods_supported"]).find do |am|
             SUPPORTED_AUTH_METHODS.include?(am)
           end
+          nil
         end
 
         def merge(other)

data/lib/httpx/pool.rb

@@ -19,6 +19,17 @@ module HTTPX
       @connections = []
     end
 
+    def wrap
+      connections = @connections
+      @connections = []
+
+      begin
+        yield self
+      ensure
+        @connections.unshift(*connections)
+      end
+    end
+
     def empty?
       @connections.empty?
     end

data/lib/httpx/request.rb

@@ -61,7 +61,7 @@ module HTTPX
         @uri = origin.merge("#{base_path}#{@uri}")
       end
 
-      @headers = @options.headers_class.new(@options.headers)
+      @headers = @options.headers.dup
       @headers["user-agent"] ||= USER_AGENT
       @headers["accept"]     ||= "*/*"
 

data/lib/httpx/session.rb

@@ -28,13 +28,15 @@ module HTTPX
     #     http.get("https://wikipedia.com")
     #   end # wikipedia connection closes here
     def wrap
-      begin
-        prev_persistent = @persistent
-        @persistent = true
-        yield self
-      ensure
-        @persistent = prev_persistent
-        close unless @persistent
+      prev_persistent = @persistent
+      @persistent = true
+      pool.wrap do
+        begin
+          yield self
+        ensure
+          @persistent = prev_persistent
+          close unless @persistent
+        end
       end
     end
 

data/lib/httpx/version.rb

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

data/sig/pool.rbs

@@ -7,6 +7,8 @@ module HTTPX
     @selector: Selector
     @connections: Array[Connection]
 
+    def wrap: () { (instance) -> void } -> void
+
     def empty?: () -> void
 
     def next_tick: () -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -139,6 +139,7 @@ extra_rdoc_files:
 - doc/release_notes/1_1_5.md
 - doc/release_notes/1_2_0.md
 - doc/release_notes/1_2_1.md
+- doc/release_notes/1_2_2.md
 files:
 - LICENSE.txt
 - README.md
@@ -249,6 +250,7 @@ files:
 - doc/release_notes/1_1_5.md
 - doc/release_notes/1_2_0.md
 - doc/release_notes/1_2_1.md
+- doc/release_notes/1_2_2.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb