httpx 1.6.2 → 1.6.3

data/lib/httpx/transcoder/deflate.rb

@@ -10,15 +10,20 @@ module HTTPX
         def deflate(chunk)
           @deflater ||= Zlib::Deflate.new
 
-          if chunk.nil?
-            unless @deflater.closed?
-              last = @deflater.finish
-              @deflater.close
-              last.empty? ? nil : last
-            end
-          else
-            @deflater.deflate(chunk)
+          unless chunk.nil?
+            chunk = @deflater.deflate(chunk)
+
+            # deflate call may return nil, while still
+            # retaining the last chunk in the deflater.
+            return chunk unless chunk.empty?
           end
+
+          return if @deflater.closed?
+
+          last = @deflater.finish
+          @deflater.close
+
+          last unless last.empty?
         end
       end
 

data/lib/httpx/transcoder/utils/body_reader.rb

@@ -28,8 +28,7 @@ module HTTPX
         begin
           chunk = @body.next
           if outbuf
-            outbuf.clear.force_encoding(Encoding::BINARY)
-            outbuf << chunk
+            outbuf.replace(chunk)
           else
             outbuf = chunk
           end

data/lib/httpx/transcoder/utils/deflater.rb

@@ -31,8 +31,7 @@ module HTTPX
         return unless compressed_chunk
 
         if outbuf
-          outbuf.clear.force_encoding(Encoding::BINARY)
-          outbuf << compressed_chunk
+          outbuf.replace(compressed_chunk)
         else
           compressed_chunk
         end

data/lib/httpx/version.rb

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

data/sig/connection.rbs

@@ -46,6 +46,7 @@ module HTTPX
     @exhausted: bool
     @cloned: bool
     @coalesced_connection: instance?
+    @altsvc_connection: instance?
     @sibling: instance?
     @main_sibling: bool
 
@@ -66,6 +67,8 @@ module HTTPX
 
     def coalesce!: (instance connection) -> void
 
+    def coalesced?: () -> boolish
+
     def coalescable?: (Connection connection) -> bool
 
     def create_idle: (?Hash[Symbol, untyped] options) -> instance
@@ -76,7 +79,9 @@ module HTTPX
 
     def connecting?: () -> bool
 
-    def io_connected?: () -> bool
+    def current_context?: () -> bool
+
+    def io_connected?: () -> boolish
 
     def inflight?: () -> boolish
 
@@ -90,6 +95,8 @@ module HTTPX
 
     def close: () -> void
 
+    def force_close: (?bool delete_pending) -> void
+
     def force_reset: (?bool cloned) -> void
 
     def reset: () -> void
@@ -112,6 +119,8 @@ module HTTPX
 
     def disconnect: () -> void
 
+    def on_error: (HTTPX::TimeoutError | Error | StandardError error, ?Request? request) -> void
+
     private
 
     def initialize: (http_uri uri, Options options) -> void
@@ -130,6 +139,8 @@ module HTTPX
 
     def send_request_to_parser: (Request request) -> void
 
+    def enqueue_pending_requests_from_parser: (HTTP1 | HTTP2 parser) -> void
+
     def build_parser: (?String protocol) -> (Object & _Parser)
 
     def set_parser_callbacks: (HTTP1 | HTTP2 parser) -> void
@@ -142,8 +153,6 @@ module HTTPX
 
     def build_socket: (?Array[Resolver::Entry]? addrs) -> (TCP | SSL | UNIX)
 
-    def on_error: (HTTPX::TimeoutError | Error | StandardError error, ?Request? request) -> void
-
     def handle_error: (StandardError error, ?Request? request) -> void
 
     def close_sibling: () -> void

data/sig/loggable.rbs

@@ -12,6 +12,10 @@ module HTTPX
 
     def log_exception: (Exception error, ?level: Integer, ?color: Symbol, ?debug_level: Integer, ?debug: _IOLogger?) -> void
 
-    def log_redact: (_ToS text, ?bool should_redact) -> String
+    def log_redact_headers: (_ToS text) -> String
+
+    def log_redact_body: (_ToS text) -> String
+
+    def log_redact: (_ToS text, bool should_redact) -> String
   end
 end

data/sig/options.rbs

@@ -17,9 +17,11 @@ module HTTPX
 
     DEFAULT_OPTIONS: Hash[Symbol, untyped]
     REQUEST_BODY_IVARS: Array[Symbol]
+    USER_AGENT: String
 
     type timeout_type = :connect_timeout | :settings_timeout | :close_handshake_timeout | :operation_timeout | :keep_alive_timeout | :read_timeout | :write_timeout | :request_timeout
     type timeout = Hash[timeout_type, Numeric?]
+    type redact_value = :headers | :body | bool
 
     def self.new: (?options) -> instance
 
@@ -146,6 +148,8 @@ module HTTPX
 
     def initialize: (?options options) -> void
 
+    def do_initialize: (?options options) -> void
+
     def access_option: (Hash[Symbol, untyped] | Object | nil obj, Symbol k, Hash[Symbol, Symbol]? ivar_map) -> untyped
 
     # integer
@@ -175,7 +179,7 @@ module HTTPX
     def option_io: (io_option value) -> io_option
     def option_fallback_protocol: (String value) -> String
     def option_debug: (_IOLogger value) -> _IOLogger
-    def option_debug_redact: (bool value) -> bool
+    def option_debug_redact: (redact_value value) -> redact_value
     def option_compress_request_body: (bool value) -> bool
     def option_decompress_response_body: (bool value) -> bool
     def option_persistent: (bool value) -> bool

data/sig/plugins/callbacks.rbs

@@ -31,6 +31,9 @@ module HTTPX
 
         def emit_or_callback_error: (*untyped) -> void
       end
+
+      module ConnectionMethods
+      end
     end
 
     type sessionCallbacks = Session & Callbacks::InstanceMethods

data/sig/plugins/stream_bidi.rbs

@@ -5,7 +5,7 @@ module HTTPX
 
       def self.extra_options: (Options) -> (Options)
 
-      class HTTP2Bidi < Connection::HTTP2
+      module HTTP2Methods
         @lock: Thread::Mutex
 
         private
@@ -24,6 +24,8 @@ module HTTPX
       end
 
       class Signal
+        attr_reader error: Exception?
+
         @closed: bool
         @pipe_read: IO
         @pipe_write: IO
@@ -55,10 +57,6 @@ module HTTPX
 
       module ConnectionMethods
         @write_buffer: BidiBuffer
-
-        private
-
-        def parser_type: (String protocol) -> (singleton(Connection::HTTP1) | singleton(Connection::HTTP2) | singleton(HTTP2Bidi))
       end
 
     end

data/sig/resolver/https.rbs

@@ -40,6 +40,8 @@ module HTTPX
       def decode_response_body: (Response) -> dns_decoding_response
 
       def reset_hostname: (String hostname, ?reset_candidates: bool) -> Connection?
+
+      def close_or_resolve: (?bool should_deactivate) -> void
     end
   end
 end

data/sig/resolver/multi.rbs

@@ -8,7 +8,6 @@ module HTTPX
       @current_selector: Selector?
       @current_session: Session?
       @resolver_options: Hash[Symbol, untyped]
-      # @errors: Hash[Symbol, untyped]
 
       def current_selector=: (Selector s) -> void
 
@@ -16,14 +15,6 @@ module HTTPX
 
       def closed?: () -> bool
 
-      def empty?: () -> bool
-
-      def timeout: () -> Numeric?
-
-      def close: () -> void
-
-      def connections: () -> Array[Connection]
-
       def early_resolve: (Connection connection) -> bool
 
       def lazy_resolve: (Connection connection) -> void

data/sig/resolver/native.rbs

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

data/sig/resolver/resolver.rbs

@@ -1,7 +1,6 @@
 module HTTPX
   module Resolver
     class Resolver
-      include Callbacks
       include Loggable
 
       include _Selectable
@@ -26,7 +25,9 @@ module HTTPX
 
       def close: () -> void
 
-      alias terminate close
+      def terminate: () -> void
+
+      def force_close: (*untyped args) -> void
 
       def closed?: () -> bool
 
@@ -36,8 +37,12 @@ module HTTPX
 
       def emit_addresses: (Connection connection, ip_family family, Array[ipaddr], ?bool early_resolve) -> void
 
+      def handle_error: (ResolveError | StandardError) -> void
+
       def self.multi?: () -> bool
 
+      def early_resolve: (Connection connection, ?hostname: String) -> bool
+
       private
 
       def resolve: (?Connection connection, ?String hostname) -> void
@@ -46,19 +51,15 @@ module HTTPX
 
       def initialize: (ip_family family, Options options) -> void
 
-      def early_resolve: (Connection connection, ?hostname: String) -> bool
-
-      def set_resolver_callbacks: () -> void
-
       def resolve_connection: (Connection connection) -> void
 
       def emit_connection_error: (Connection connection, StandardError error) -> void
 
-      def close_resolver: (Resolver resolver) -> void
-
       def emit_resolve_error: (Connection connection, ?String hostname, ?StandardError) -> void
 
       def resolve_error: (String hostname, ?StandardError?) -> (ResolveError | ResolveTimeoutError)
+
+      def close_or_resolve: () -> void
     end
   end
 end

data/sig/resolver/system.rbs

@@ -16,7 +16,9 @@ module HTTPX
 
       attr_reader state: Symbol
 
-      def <<: (Connection) -> void
+      def initialize: (Options options) -> void
+
+      def lazy_resolve: (Connection connection) -> void
 
       private
 
@@ -28,7 +30,7 @@ module HTTPX
 
       def __addrinfo_resolve: (String host, String scheme) -> Array[Addrinfo]
 
-      def initialize: (Options options) -> void
+      def close_or_resolve: () -> void
     end
   end
 end

data/sig/selector.rbs

@@ -11,6 +11,8 @@ module HTTPX
     def timeout: () -> Numeric?
 
     def handle_socket_timeout: (Numeric interval) -> void
+
+    def on_error: (StandardError) -> void
   end
 
   class Selector

data/sig/session.rbs

@@ -15,6 +15,8 @@ module HTTPX
     @wrapped: bool
     @closing: bool
 
+    type resolver = Resolver::Multi | Resolver::Resolver
+
     def wrap: () { (instance) -> void } -> void
 
     def close: (?Selector selector) -> void
@@ -23,11 +25,11 @@ module HTTPX
 
     def select_connection: (Connection connection, Selector selector) -> void
 
-    def pin_connection: (Resolver::Resolver | Connection connection, Selector selector) -> void
+    def pin: (resolver | Connection conn_or_resolver, Selector selector) -> void
 
     def deselect_connection: (Connection connection, Selector selector, ?bool cloned) -> void
 
-    def select_resolver: (Resolver::Native | Resolver::HTTPS resolver, Selector selector) -> void
+    def select_resolver: (Resolver::Resolver resolver, Selector selector) -> void
 
     def deselect_resolver: (Resolver::Resolver resolver, Selector selector) -> void
 
@@ -72,7 +74,7 @@ module HTTPX
 
     def on_resolver_close: (Resolver::Resolver resolver, Selector selector) -> void
 
-    def find_resolver_for: (Connection connection, Selector selector) -> (Resolver::Multi | Resolver::Resolver)
+    def find_resolver_for: (Connection connection, Selector selector) -> resolver
 
     def coalesce_connections: (Connection conn1, Connection conn2, Selector selector, bool from_pool) -> bool
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -158,6 +158,7 @@ extra_rdoc_files:
 - doc/release_notes/1_6_0.md
 - doc/release_notes/1_6_1.md
 - doc/release_notes/1_6_2.md
+- doc/release_notes/1_6_3.md
 files:
 - LICENSE.txt
 - README.md
@@ -288,6 +289,7 @@ files:
 - doc/release_notes/1_6_0.md
 - doc/release_notes/1_6_1.md
 - doc/release_notes/1_6_2.md
+- doc/release_notes/1_6_3.md
 - lib/httpx.rb
 - lib/httpx/adapters/datadog.rb
 - lib/httpx/adapters/faraday.rb