httpx 1.4.0 → 1.4.4

data/lib/httpx/session.rb

@@ -69,8 +69,6 @@ module HTTPX
       while (connection = @pool.pop_connection)
         next if connection.state == :closed
 
-        connection.current_session = self
-        connection.current_selector = selector
         select_connection(connection, selector)
       end
       begin
@@ -126,9 +124,15 @@ module HTTPX
     end
 
     def select_connection(connection, selector)
+      pin_connection(connection, selector)
       selector.register(connection)
     end
 
+    def pin_connection(connection, selector)
+      connection.current_session = self
+      connection.current_selector = selector
+    end
+
     alias_method :select_resolver, :select_connection
 
     def deselect_connection(connection, selector, cloned = false)
@@ -160,36 +164,8 @@ module HTTPX
       new_connection = connection.class.new(connection.origin, connection.options)
 
       new_connection.family = family
-      new_connection.current_session = self
-      new_connection.current_selector = selector
-
-      connection.once(:tcp_open) { new_connection.force_reset(true) }
-      connection.once(:connect_error) do |err|
-        if new_connection.connecting?
-          new_connection.merge(connection)
-          connection.emit(:cloned, new_connection)
-          connection.force_reset(true)
-        else
-          connection.__send__(:handle_error, err)
-        end
-      end
 
-      new_connection.once(:tcp_open) do |new_conn|
-        if new_conn != connection
-          new_conn.merge(connection)
-          connection.force_reset(true)
-        end
-      end
-      new_connection.once(:connect_error) do |err|
-        if connection.connecting?
-          # main connection has the requests
-          connection.merge(new_connection)
-          new_connection.emit(:cloned, connection)
-          new_connection.force_reset(true)
-        else
-          new_connection.__send__(:handle_error, err)
-        end
-      end
+      connection.sibling = new_connection
 
       do_init_connection(new_connection, selector)
       new_connection
@@ -203,22 +179,20 @@ module HTTPX
 
       connection = @pool.checkout_connection(request_uri, options)
 
-      connection.current_session = self
-      connection.current_selector = selector
-
       case connection.state
       when :idle
         do_init_connection(connection, selector)
       when :open
-        select_connection(connection, selector) if options.io
-      when :closed
-        connection.idling
-        select_connection(connection, selector)
-      when :closing
-        connection.once(:close) do
-          connection.idling
+        if options.io
           select_connection(connection, selector)
+        else
+          pin_connection(connection, selector)
         end
+      when :closing, :closed
+        connection.idling
+        select_connection(connection, selector)
+      else
+        pin_connection(connection, selector)
       end
 
       connection
@@ -261,11 +235,9 @@ module HTTPX
       end
       return unless error && error.is_a?(Exception)
 
-      if error.is_a?(Error)
-        request.emit(:response, ErrorResponse.new(request, error))
-      else
-        raise error if selector.empty?
-      end
+      raise error unless error.is_a?(Error)
+
+      request.emit(:response, ErrorResponse.new(request, error))
     end
 
     # returns a set of HTTPX::Request objects built from the given +args+ and +options+.
@@ -372,7 +344,6 @@ module HTTPX
         #    resolve a name (not the same as name being an IP, yet)
         # 2. when the connection is initialized with an external already open IO.
         #
-        connection.once(:connect_error, &connection.method(:handle_error))
         on_resolver_connection(connection, selector)
         return
       end
@@ -395,6 +366,8 @@ module HTTPX
         coalesce_connections(found_connection, connection, selector, from_pool)
       else
         found_connection.once(:open) do
+          next unless found_connection.current_session == self
+
           coalesce_connections(found_connection, connection, selector, from_pool)
         end
       end
@@ -428,8 +401,6 @@ module HTTPX
         return false
       end
 
-      conn2.emit(:tcp_open, conn1)
-      conn1.merge(conn2)
       conn2.coalesced_connection = conn1
       select_connection(conn1, selector) if from_pool
       deselect_connection(conn2, selector)

data/lib/httpx/timers.rb

@@ -26,7 +26,7 @@ module HTTPX
 
       @next_interval_at = nil
 
-      interval
+      Timer.new(interval, callback)
     end
 
     def wait_interval
@@ -48,6 +48,17 @@ module HTTPX
       @next_interval_at = nil if @intervals.empty?
     end
 
+    class Timer
+      def initialize(interval, callback)
+        @interval = interval
+        @callback = callback
+      end
+
+      def cancel
+        @interval.delete(@callback)
+      end
+    end
+
     class Interval
       include Comparable
 
@@ -63,6 +74,10 @@ module HTTPX
         @on_empty = blk
       end
 
+      def cancel
+        @on_empty.call
+      end
+
       def <=>(other)
         @interval <=> other.interval
       end

data/lib/httpx/transcoder/body.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "forwardable"
+require "delegate"
 
 module HTTPX::Transcoder
   module Body
@@ -8,48 +8,32 @@ module HTTPX::Transcoder
 
     module_function
 
-    class Encoder
-      extend Forwardable
-
-      def_delegator :@raw, :to_s
-
-      def_delegator :@raw, :==
-
+    class Encoder < SimpleDelegator
       def initialize(body)
-        @raw = body
+        body = body.open(File::RDONLY, encoding: Encoding::BINARY) if Object.const_defined?(:Pathname) && body.is_a?(Pathname)
+        @body = body
+        super(body)
       end
 
       def bytesize
-        if @raw.respond_to?(:bytesize)
-          @raw.bytesize
-        elsif @raw.respond_to?(:to_ary)
-          @raw.sum(&:bytesize)
-        elsif @raw.respond_to?(:size)
-          @raw.size || Float::INFINITY
-        elsif @raw.respond_to?(:length)
-          @raw.length || Float::INFINITY
-        elsif @raw.respond_to?(:each)
+        if @body.respond_to?(:bytesize)
+          @body.bytesize
+        elsif @body.respond_to?(:to_ary)
+          @body.sum(&:bytesize)
+        elsif @body.respond_to?(:size)
+          @body.size || Float::INFINITY
+        elsif @body.respond_to?(:length)
+          @body.length || Float::INFINITY
+        elsif @body.respond_to?(:each)
           Float::INFINITY
         else
-          raise Error, "cannot determine size of body: #{@raw.inspect}"
+          raise Error, "cannot determine size of body: #{@body.inspect}"
         end
       end
 
       def content_type
         "application/octet-stream"
       end
-
-      private
-
-      def respond_to_missing?(meth, *args)
-        @raw.respond_to?(meth, *args) || super
-      end
-
-      def method_missing(meth, *args, &block)
-        return super unless @raw.respond_to?(meth)
-
-        @raw.__send__(meth, *args, &block)
-      end
     end
 
     def encode(body)

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

@@ -11,6 +11,7 @@ module HTTPX
         @buffer = "".b
 
         @form = form
+        @bytesize = 0
         @parts = to_parts(form)
       end
 
@@ -42,6 +43,7 @@ module HTTPX
           aux << [key, val]
         end
         @form = form
+        @bytesize = 0
         @parts = to_parts(form)
         @part_index = 0
       end
@@ -49,7 +51,6 @@ module HTTPX
       private
 
       def to_parts(form)
-        @bytesize = 0
         params = form.each_with_object([]) do |(key, val), aux|
           Transcoder.normalize_keys(key, val, MULTIPART_VALUE_COND) do |k, v|
             next if v.nil?

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

@@ -19,7 +19,7 @@ module HTTPX
           value = value[:body]
         end
 
-        value = value.open(File::RDONLY) if Object.const_defined?(:Pathname) && value.is_a?(Pathname)
+        value = value.open(File::RDONLY, encoding: Encoding::BINARY) if Object.const_defined?(:Pathname) && value.is_a?(Pathname)
 
         if value.respond_to?(:path) && value.respond_to?(:read)
           # either a File, a Tempfile, or something else which has to quack like a file

data/lib/httpx/version.rb

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

data/lib/httpx.rb

@@ -61,6 +61,6 @@ require "httpx/session_extensions"
 
 # load integrations when possible
 
-require "httpx/adapters/datadog" if defined?(DDTrace) || defined?(Datadog)
+require "httpx/adapters/datadog" if defined?(DDTrace) || defined?(Datadog::Tracing)
 require "httpx/adapters/sentry" if defined?(Sentry)
 require "httpx/adapters/webmock" if defined?(WebMock)

data/sig/callbacks.rbs

@@ -4,8 +4,8 @@ module HTTPX
   end
 
   module Callbacks
-    def on: (Symbol) { (*untyped) -> void } -> self
-    def once: (Symbol) { (*untyped) -> void } -> self
+    def on: (Symbol) { (*untyped) -> void } -> ^(*untyped) -> void
+    def once: (Symbol) { (*untyped) -> void } -> ^(*untyped) -> void
     def emit: (Symbol, *untyped) -> void
 
     def callbacks_for?: (Symbol) -> bool

data/sig/connection/http2.rbs

@@ -8,6 +8,7 @@ module HTTPX
     attr_reader streams: Hash[Request, ::HTTP2::Stream]
     attr_reader pending: Array[Request]
 
+    @connection: HTTP2::Client
     @options: Options
     @settings: Hash[Symbol, Integer | bool]
     @max_concurrent_requests: Integer
@@ -95,5 +96,8 @@ module HTTPX
 
     class GoawayError < Error
     end
+
+    class PingError < Error
+    end
   end
 end

data/sig/connection.rbs

@@ -26,11 +26,12 @@ module HTTPX
     attr_reader pending: Array[Request]
     attr_reader options: Options
     attr_reader ssl_session: OpenSSL::SSL::Session?
+    attr_reader sibling: instance?
     attr_writer current_selector: Selector?
-    attr_writer coalesced_connection: instance?
     attr_accessor current_session: Session?
     attr_accessor family: Integer?
 
+
     @window_size: Integer
     @read_buffer: Buffer
     @write_buffer: Buffer
@@ -42,9 +43,12 @@ module HTTPX
     @parser: Object & _Parser
     @connected_at: Float
     @response_received_at: Float
-    @intervals: Array[Timers::Interval]
     @exhausted: bool
     @cloned: bool
+    @coalesced_connection: instance?
+    @sibling: instance?
+    @main_sibling: bool
+
 
     def addresses: () -> Array[ipaddr]?
 
@@ -70,6 +74,8 @@ module HTTPX
 
     def connecting?: () -> bool
 
+    def io_connected?: () -> bool
+
     def inflight?: () -> boolish
 
     def interests: () -> io_interests?
@@ -98,6 +104,14 @@ module HTTPX
 
     def handle_socket_timeout: (Numeric interval) -> void
 
+    def coalesced_connection=: (instance connection) -> void
+
+    def sibling=: (instance? connection) -> void
+
+    def handle_connect_error: (StandardError error) -> void
+
+    def disconnect: () -> void
+
     private
 
     def initialize: (http_uri uri, Options options) -> void
@@ -106,8 +120,6 @@ module HTTPX
 
     def connect: () -> void
 
-    def disconnect: () -> void
-
     def exhausted?: () -> boolish
 
     def consume: () -> void
@@ -134,6 +146,8 @@ module HTTPX
 
     def handle_error: (StandardError error, ?Request? request) -> void
 
+    def close_sibling: () -> void
+
     def purge_after_closed: () -> void
 
     def set_request_timeouts: (Request request) -> void
@@ -148,7 +162,7 @@ module HTTPX
 
     def read_timeout_callback: (Request request, Numeric read_timeout, ?singleton(RequestTimeoutError) error_type) -> void
 
-    def set_request_timeout: (Request request, Numeric timeout, Symbol start_event, Symbol | Array[Symbol] finish_events) { () -> void } -> void
+    def set_request_timeout: (Symbol label, Request request, Numeric timeout, Symbol start_event, Symbol | Array[Symbol] finish_events) { () -> void } -> void
 
     def self.parser_type: (String protocol) -> (singleton(HTTP1) | singleton(HTTP2))
   end

data/sig/errors.rbs

@@ -45,6 +45,9 @@ module HTTPX
   class WriteTimeoutError < RequestTimeoutError
   end
 
+  class OperationTimeoutError < TimeoutError
+  end
+
   class ResolveError < Error
   end
 
@@ -64,7 +67,4 @@ module HTTPX
 
     def initialize: (Connection connection, String hostname, ?String message) -> untyped
   end
-
-  class MisdirectedRequestError < HTTPError
-  end
 end

data/sig/loggable.rbs

@@ -8,8 +8,8 @@ module HTTPX
 
     COLORS: Hash[Symbol, Integer]
 
-    def log: (?level: Integer?, ?color: Symbol?) { () -> String } -> void
+    def log: (?level: Integer?, ?color: Symbol?, ?debug_level: Integer, ?debug: _IOLogger?) { () -> String } -> void
 
-    def log_exception: (Exception error, ?level: Integer, ?color: Symbol) -> void
+    def log_exception: (Exception error, ?level: Integer, ?color: Symbol, ?debug_level: Integer, ?debug: _IOLogger?) -> void
   end
 end

data/sig/plugins/stream.rbs

@@ -27,7 +27,10 @@ module HTTPX
     type streamRequest = Request & Plugins::Stream::RequestMethods
 
     @request: streamRequest
+    @options: Options
     @session: Plugins::sessionStream
+    @response_enum: Enumerator[String]?
+    @buffered_chunks: Array[String]
     @on_chunk: ^(String) -> void | nil
 
     def each: () { (String) -> void } -> void

data/sig/pool.rbs

@@ -5,6 +5,8 @@ module HTTPX
   }
 
   class Pool
+    POOL_TIMEOUT: Integer
+
     type resolver_manager = Resolver::Multi | Resolver::System
 
     @max_connections_per_origin: Integer

data/sig/request/body.rbs

@@ -31,12 +31,4 @@ module HTTPX
 
     def self.initialize_deflater_body: (body_encoder body, Encoding | String encoding) -> body_encoder
   end
-
-  class ProcIO
-    @block: ^(String) -> void
-
-    def initialize: (^(String) -> void) -> untyped
-
-    def write: (String data) -> Integer
-  end
 end

data/sig/request.rbs

@@ -14,11 +14,13 @@ module HTTPX
     attr_reader options: Options
     attr_reader response: response?
     attr_reader drain_error: StandardError?
+    attr_reader active_timeouts: Array[Symbol]
 
     attr_accessor peer_address: ipaddr?
 
     attr_writer persistent: bool
 
+    @ping: bool
     @query_params: Hash[interned, untyped]?
     @trailers: Headers?
     @informational_status: Integer?
@@ -27,6 +29,14 @@ module HTTPX
 
     def initialize: (Symbol | String verb, generic_uri uri, Options options, ?request_params params) -> untyped
 
+    def ping?: () -> bool
+
+    def ping!: () -> void
+
+    def empty?: () -> bool
+
+    def close: () -> void
+
     def interests: () -> (:r | :w)
 
     def merge_headers: (_Each[[String, headers_value]]) -> void
@@ -63,6 +73,8 @@ module HTTPX
 
     def request_timeout: () -> Numeric?
 
+    def set_timeout_callback: (Symbol event) { (*untyped) -> void } -> void
+
     private
 
     def initialize_body: (Options options) -> Transcoder::_Encoder?

data/sig/resolver/native.rbs

@@ -21,6 +21,7 @@ module HTTPX
       @write_buffer: Buffer
       @large_packet: Buffer?
       @io: UDP | TCP
+      @name: String?
 
       attr_reader state: Symbol
 
@@ -42,7 +43,9 @@ module HTTPX
 
       def consume: () -> void
 
-      def do_retry: (?Numeric? loop_time) -> void
+      def schedule_retry: () -> void
+
+      def do_retry: (String host, Connection connection, Numeric interval) -> void
 
       def dread: (Integer) -> void
                | () -> void
@@ -64,6 +67,8 @@ module HTTPX
       def handle_error: (NativeResolveError | StandardError) -> void
 
       def reset_hostname: (String hostname, ?connection: Connection, ?reset_candidates: bool) -> void
+
+      def close_or_resolve: () -> void
     end
   end
 end

data/sig/response.rbs

@@ -1,5 +1,7 @@
 module HTTPX
   interface _Response
+    def <<: (String data) -> void
+
     def finished?: () -> bool
 
     def raise_for_status: () -> self
@@ -23,6 +25,7 @@ module HTTPX
     @options: Options
     @request: Request
     @content_type: ContentType
+    @finished: bool
 
     def copy_to: (_ToPath | _Writer destination) -> void
 
@@ -38,9 +41,11 @@ module HTTPX
 
     def content_type: () -> ContentType
 
+    def finish!: () -> void
+
     def complete?: () -> bool
 
-    def json: (?json_options opts) -> untyped
+    def json: (?JSON::options opts) -> untyped
 
     def form: () -> Hash[String, untyped]
 
@@ -77,9 +82,9 @@ module HTTPX
     @options: Options
     @error: Exception
 
-    attr_reader request: Request
+    %a{pure} attr_reader request: Request
 
-    attr_reader response: Response?
+    %a{pure} attr_reader response: Response?
 
     def status: () -> (Integer | _ToS)
 

data/sig/selector.rbs

@@ -10,6 +10,7 @@ module HTTPX
     @timers: Timers
 
     @selectables: Array[selectable]
+    @is_timer_interval: bool
 
     def next_tick: () -> void
 

data/sig/session.rbs

@@ -25,6 +25,8 @@ module HTTPX
 
     def select_connection: (Connection connection, Selector selector) -> void
 
+    def pin_connection: (Resolver::Resolver | Connection connection, Selector selector) -> void
+
     def deselect_connection: (Connection connection, Selector selector, ?bool cloned) -> void
 
     def select_resolver: (Resolver::Native | Resolver::HTTPS resolver, Selector selector) -> void

data/sig/timers.rbs

@@ -1,10 +1,12 @@
 module HTTPX
   class Timers
+    type callback = ^() -> void
+
     @intervals: Array[Interval]
     @next_interval_at: Float
 
-    def after: (Numeric interval_in_secs, ^() -> void) -> Interval
-             | (Numeric interval_in_secs) { () -> void } -> Interval
+    def after: (Numeric interval_in_secs, ^() -> void) -> Timer
+             | (Numeric interval_in_secs) { () -> void } -> Timer
 
     def wait_interval: () -> Numeric?
 
@@ -15,8 +17,6 @@ module HTTPX
     class Interval
       include Comparable
 
-      type callback = ^() -> void
-
       attr_reader interval: Numeric
 
       @callbacks: Array[callback]
@@ -25,6 +25,8 @@ module HTTPX
 
       def on_empty: () { () -> void } -> void
 
+      def cancel: () -> void
+
       def to_f: () -> Float
 
       def <<: (callback) -> void
@@ -41,5 +43,14 @@ module HTTPX
 
       def initialize: (Numeric interval) -> void
     end
+
+    class Timer
+      @interval: Interval
+      @callback: callback
+
+      def initialize: (Interval interval, callback callback) -> void
+
+      def cancel: () -> void
+    end
   end
 end

data/sig/transcoder/body.rbs

@@ -4,9 +4,7 @@ module HTTPX
       class Error < HTTPX::Error
       end
 
-      class Encoder
-        extend Forwardable
-
+      class Encoder #  < SimpleDelegator
         @raw: Object & bodyIO
 
         def bytesize: () -> (Integer | Float)

data/sig/transcoder/json.rbs

@@ -5,7 +5,7 @@ module HTTPX::Transcoder
     def self?.encode: (_ToJson json) -> Encoder
     def self?.decode: (HTTPX::Response response) -> _Decoder
 
-    def self?.json_load: (string source, ?json_options) -> untyped
+    def self?.json_load: (string source, ?JSON::options) -> untyped
     def self?.json_dump: (_ToJson obj, *untyped) -> String
 
     class Encoder

data/sig/transcoder/multipart.rbs

@@ -24,7 +24,7 @@ module HTTPX
         @form: Enumerable[[Symbol | string, Object & multipart_nested_value]]
         @parts: Array[Object & _Reader]
 
-        def bytesize: () -> Integer
+        attr_reader bytesize: Integer
 
         def content_type: () -> String
 

data/sig/transcoder/utils/body_reader.rbs

@@ -7,7 +7,7 @@ module HTTPX
 
       def bytesize: () -> (Integer | Float)
 
-      def read: (?int? length, ?string outbuf) -> String?
+      def read: (?int? length, ?string? outbuf) -> String?
 
       def close: () -> void
     end