httpx 1.4.0 → 1.4.2

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/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.2"
 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.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
 

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,6 +14,7 @@ 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?
 
@@ -63,6 +64,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/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/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

data/sig/transcoder/utils/deflater.rbs

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-18 00:00:00.000000000 Z
+date: 2025-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -150,6 +150,8 @@ extra_rdoc_files:
 - doc/release_notes/1_3_3.md
 - doc/release_notes/1_3_4.md
 - doc/release_notes/1_4_0.md
+- doc/release_notes/1_4_1.md
+- doc/release_notes/1_4_2.md
 files:
 - LICENSE.txt
 - README.md
@@ -271,6 +273,8 @@ files:
 - doc/release_notes/1_3_3.md
 - doc/release_notes/1_3_4.md
 - doc/release_notes/1_4_0.md
+- doc/release_notes/1_4_1.md
+- doc/release_notes/1_4_2.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb
@@ -491,7 +495,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: HTTPX, to the future, and beyond