httpx 0.11.3 → 0.12.0

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

@@ -29,18 +29,13 @@ module HTTPX::Plugins
 
       def rewind
         form = @form.each_with_object([]) do |(key, val), aux|
-          v = case val
-              when File
-                val = val.reopen(val.path, File::RDONLY) if val.closed?
-                val.rewind
-                val
-              else
-                v
-          end
-          aux << [key, v]
+          val = val.reopen(val.path, File::RDONLY) if val.is_a?(File) && val.closed?
+          val.rewind if val.respond_to?(:rewind)
+          aux << [key, val]
         end
         @form = form
         @parts = to_parts(form)
+        @part_index = 0
       end
 
       private

data/lib/httpx/plugins/proxy.rb

@@ -242,7 +242,7 @@ module HTTPX
     register_plugin :proxy, Proxy
   end
 
-  class ProxySSL < SSL
+  class ProxySSL < IO.registry["ssl"]
     def initialize(tcp, request_uri, options)
       @io = tcp.to_io
       super(request_uri, tcp.addresses, options)

data/lib/httpx/plugins/proxy/http.rb

@@ -81,7 +81,7 @@ module HTTPX
             request.uri.to_s
           end
 
-          def set_request_headers(request)
+          def set_protocol_headers(request)
             super
             proxy_params = @options.proxy
             request.headers["proxy-authorization"] = "Basic #{proxy_params.token_authentication}" if proxy_params.authenticated?

data/lib/httpx/plugins/proxy/socks4.rb

@@ -16,6 +16,14 @@ module HTTPX
         Error = Socks4Error
 
         module ConnectionMethods
+          def interests
+            if @state == :connecting
+              return @write_buffer.empty? ? :r : :w
+            end
+
+            super
+          end
+
           private
 
           def transition(nextstate)

data/lib/httpx/plugins/proxy/socks5.rb

@@ -35,6 +35,14 @@ module HTTPX
             super || @state == :authenticating || @state == :negotiating
           end
 
+          def interests
+            if @state == :connecting || @state == :authenticating || @state == :negotiating
+              return @write_buffer.empty? ? :r : :w
+            end
+
+            super
+          end
+
           private
 
           def transition(nextstate)

data/lib/httpx/plugins/push_promise.rb

@@ -43,7 +43,7 @@ module HTTPX
         end
 
         def __on_promise_request(parser, stream, h)
-          log(level: 1) do
+          log(level: 1, color: :yellow) do
             # :nocov:
             h.map { |k, v| "#{stream.id}: -> PROMISE HEADER: #{k}: #{v}" }.join("\n")
             # :nocov:
@@ -57,6 +57,8 @@ module HTTPX
             request.merge_headers(headers)
             promise_headers[stream] = request
             parser.pending.delete(request)
+            parser.streams[request] = stream
+            request.transition(:done)
           else
             stream.refuse
           end
@@ -67,7 +69,6 @@ module HTTPX
           return unless request
 
           parser.__send__(:on_stream_headers, stream, request, h)
-          request.transition(:done)
           response = request.response
           response.mark_as_pushed!
           stream.on(:data, &parser.method(:on_stream_data).curry(3)[stream, request])

data/lib/httpx/plugins/retries.rb

@@ -17,7 +17,7 @@ module HTTPX
                           Errno::ECONNRESET,
                           Errno::ECONNABORTED,
                           Errno::EPIPE,
-                          (OpenSSL::SSL::SSLError if defined?(OpenSSL)),
+                          (TLSError if defined?(TLSError)),
                           TimeoutError,
                           Parser::Error,
                           Errno::EINVAL,

data/lib/httpx/plugins/stream.rb

@@ -119,11 +119,9 @@ module HTTPX
         end
 
         def method_missing(meth, *args, &block)
-          if @options.response_class.public_method_defined?(meth)
-            response.__send__(meth, *args, &block)
-          else
-            super
-          end
+          return super unless @options.response_class.public_method_defined?(meth)
+
+          response.__send__(meth, *args, &block)
         end
       end
     end

data/lib/httpx/pool.rb

@@ -135,7 +135,6 @@ module HTTPX
       connection.on(:close) do
         unregister_connection(connection)
       end
-      return if connection.state == :open
     end
 
     def unregister_connection(connection)

data/lib/httpx/registry.rb

@@ -62,13 +62,7 @@ module HTTPX
         handler = @registry.fetch(tag)
         raise(Error, "#{tag} is not registered in #{self}") unless handler
 
-        case handler
-        when Symbol, String
-          obj = const_get(handler)
-          @registry[tag] = obj
-        else
-          handler
-        end
+        handler
       end
 
       # @param [Object] tag the identifier for the handler in the registry

data/lib/httpx/request.rb

@@ -217,6 +217,16 @@ module HTTPX
         "#{unbounded_body? ? "stream" : "@bytesize=#{bytesize}"}>"
       end
       # :nocov:
+
+      def respond_to_missing?(meth, *args)
+        @body.respond_to?(meth, *args) || super
+      end
+
+      def method_missing(meth, *args, &block)
+        return super unless @body.respond_to?(meth)
+
+        @body.__send__(meth, *args, &block)
+      end
     end
 
     def transition(nextstate)
@@ -247,7 +257,7 @@ module HTTPX
         return if @state == :expect
       end
       @state = nextstate
-      emit(@state)
+      emit(@state, self)
       nil
     end
 

data/lib/httpx/resolver/https.rb

@@ -55,20 +55,12 @@ module HTTPX
       early_resolve(connection) || resolve(connection)
     end
 
-    def timeout
-      @connections.map(&:timeout).min
-    end
-
     def closed?
-      return true unless @resolver_connection
-
-      resolver_connection.closed?
+      true
     end
 
-    def interests
-      return if @queries.empty?
-
-      resolver_connection.__send__(__method__)
+    def empty?
+      true
     end
 
     private

data/lib/httpx/response.rb

@@ -268,8 +268,15 @@ module HTTPX
       @error.message
     end
 
-    def to_s
-      @error.backtrace.join("\n")
+    if Exception.method_defined?(:full_message)
+      def to_s
+        @error.full_message
+      end
+    else
+      def to_s
+        "#{@error.message} (#{@error.class})\n" \
+        "#{@error.backtrace.join("\n") if @error.backtrace}"
+      end
     end
 
     def raise_for_status

data/lib/httpx/selector.rb

@@ -69,6 +69,11 @@ class HTTPX::Selector
 
         if @selectables.empty?
           @selectables = selectables
+
+          # do not run event loop if there's nothing to wait on.
+          # this might happen if connect failed and connection was unregistered.
+          return if (!r || r.empty?) && (!w || w.empty?)
+
           break
         else
           @selectables = [*selectables, @selectables]

data/lib/httpx/session.rb

@@ -199,7 +199,18 @@ module HTTPX
           responses << response
           requests.shift
 
-          break if requests.empty? || pool.empty?
+          break if requests.empty?
+
+          next unless pool.empty?
+
+          # 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.
+          while (request = requests.shift)
+            responses << fetch_response(request, connections, request_options)
+          end
+          break
         end
         responses
       ensure
@@ -269,7 +280,19 @@ module HTTPX
       end
       # :nocov:
     end
+  end
+
+  unless ENV.grep(/https?_proxy$/i).empty?
+    proxy_session = plugin(:proxy)
+    ::HTTPX.send(:remove_const, :Session)
+    ::HTTPX.send(:const_set, :Session, proxy_session.class)
+  end
 
-    plugin(:proxy) unless ENV.grep(/https?_proxy$/i).empty?
+  # :nocov:
+  if Session.default_options.debug_level > 2
+    proxy_session = plugin(:internal_telemetry)
+    ::HTTPX.send(:remove_const, :Session)
+    ::HTTPX.send(:const_set, :Session, proxy_session.class)
   end
+  # :nocov:
 end

data/lib/httpx/transcoder/body.rb

@@ -44,11 +44,9 @@ module HTTPX::Transcoder
       end
 
       def method_missing(meth, *args, &block)
-        if @raw.respond_to?(meth)
-          @raw.__send__(meth, *args, &block)
-        else
-          super
-        end
+        return super unless @raw.respond_to?(meth)
+
+        @raw.__send__(meth, *args, &block)
       end
     end
 

data/lib/httpx/version.rb

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

data/sig/connection/http1.rbs

@@ -31,7 +31,7 @@ module HTTPX
 
     def on_headers: (Hash[String, Array[String]] headers) -> void
 
-    def on_trailers: (Array[String, String] headers) -> void
+    def on_trailers: (Hash[String, Array[String]] headers) -> void
 
     def on_data: (string chunk) -> void
 
@@ -51,7 +51,7 @@ module HTTPX
 
     def disable_pipelining: () -> void
 
-    def set_request_headers: (Request) -> void
+    def set_protocol_headers: (Request) -> void
 
     def headline_uri: (Request) -> String
 

data/sig/connection/http2.rbs

@@ -3,7 +3,7 @@ module HTTPX
     include Callbacks
     include Loggable
 
-    attr_reader streams: Hash[HTTP2Next::Stream, Response]
+    attr_reader streams: Hash[Request, HTTP2Next::Stream]
     attr_reader pending: Array[Request]
 
     @options: Options
@@ -13,7 +13,7 @@ module HTTPX
     @pings: Array[String]
     @buffer: Buffer
 
-    def interests: () -> io_interests
+    def interests: () -> io_interests?
 
     def close: () -> void
 
@@ -23,6 +23,8 @@ module HTTPX
 
     def <<: (String) -> void
 
+    def can_buffer_more_requests: () -> bool
+
     def send: (Request) -> void
 
     def consume: () -> void
@@ -41,7 +43,7 @@ module HTTPX
 
     def headline_uri: (Request) -> String
 
-    def set_request_headers: (Request) -> void
+    def set_protocol_headers: (Request) -> void
 
     def handle: (Request request, HTTP2Next::Stream stream) -> void
 

data/sig/plugins/aws_sdk_authentication.rbs

@@ -0,0 +1,17 @@
+module HTTPX
+  module Plugins
+    module AwsSdkAuthentication
+      class Credentials
+        include _SigV4Credentials
+      end
+
+      def self.load_dependencies: (singleton(Session)) -> void
+
+      def self.extra_options: (Options) -> (Options)
+
+      module InstanceMethods
+        def aws_sdk_authentication: (**untyped) -> instance
+      end
+    end
+  end
+end

data/sig/plugins/aws_sigv4.rbs

@@ -0,0 +1,65 @@
+module HTTPX
+  module Plugins
+
+    interface _SigV4Credentials
+      def username: () -> String
+      def password: () -> String
+      def security_token: () -> String?
+    end
+
+    module AWSSigV4
+
+      Credentials: _SigV4Credentials
+
+
+      class Signer
+
+        def sign!: (Request) -> void
+
+        private
+
+        def initialize: (
+          service: String,
+          region: String,
+          ?credentials: _SigV4Credentials,
+          ?username: String,
+          ?password: String,
+          ?security_token: String,
+          ?provider_prefix: String,
+          ?header_provider_field: String,
+          ?unsigned_headers: Array[String],
+          ?apply_checksum_header: bool,
+          ?algorithm: String
+        ) -> untyped
+
+
+        def sha256_hexdigest: (bodyIO value) -> String
+
+        def hmac: (String key, String value) -> String
+        def hexhmac: (String key, String value) -> String
+      end
+
+
+      interface _SigV4Options
+        def sigv4_signer: () -> Signer?
+        def sigv4_signer=: (Signer) -> Signer
+        def with_sigv4_signer: (Signer) -> instance
+      end
+
+      def self.extra_options: (Options) -> (Options & _SigV4Options)
+      def self.load_dependencies: (singleton(Session)) -> void
+
+      module InstanceMethods
+        def aws_sigv4_authentication: (**untyped) -> instance
+      end
+
+      module RequestMethods
+        def canonical_path: () -> String
+
+        def canonical_query: () -> String
+      end
+    end
+
+    type awsSigV4Session = Session & Plugins::AWSSigV4::InstanceMethods
+  end
+end

data/sig/plugins/push_promise.rbs

@@ -11,7 +11,7 @@ module HTTPX
       module InstanceMethods
         private
 
-        def promise_headers:  () -> Hash[HTTP2Next::Stream, Request]
+        def promise_headers: () -> Hash[HTTP2Next::Stream, Request]
         def __on_promise_request: (Connection::HTTP2, HTTP2Next::Stream, headers_input) -> void
         def __on_promise_response: (Connection::HTTP2, HTTP2Next::Stream, headers_input) -> void
       end