httpx 0.13.0 → 0.14.2

data/lib/httpx/session.rb

@@ -77,7 +77,7 @@ module HTTPX
     end
 
     def set_connection_callbacks(connection, connections, options)
-      connection.on(:misdirected) do |misdirected_request|
+      connection.only(:misdirected) do |misdirected_request|
         other_connection = connection.create_idle(ssl: { alpn_protocols: %w[http/1.1] })
         other_connection.merge(connection)
         catch(:coalesced) do
@@ -88,11 +88,11 @@ module HTTPX
         misdirected_request.transition(:idle)
         other_connection.send(misdirected_request)
       end
-      connection.on(:altsvc) do |alt_origin, origin, alt_params|
+      connection.only(:altsvc) do |alt_origin, origin, alt_params|
         other_connection = build_altsvc_connection(connection, connections, alt_origin, origin, alt_params, options)
         connections << other_connection if other_connection
       end
-      connection.on(:exhausted) do
+      connection.only(:exhausted) do
         other_connection = connection.create_idle
         other_connection.merge(connection)
         catch(:coalesced) do
@@ -175,12 +175,18 @@ module HTTPX
     end
 
     def send_requests(*requests, options)
-      connections = []
       request_options = @options.merge(options)
 
+      connections = _send_requests(requests, request_options)
+      receive_requests(requests, connections, request_options)
+    end
+
+    def _send_requests(requests, options)
+      connections = []
+
       requests.each do |request|
         error = catch(:resolve_error) do
-          connection = find_connection(request, connections, request_options)
+          connection = find_connection(request, connections, options)
           connection.send(request)
         end
         next unless error.is_a?(ResolveError)
@@ -188,13 +194,17 @@ module HTTPX
         request.emit(:response, ErrorResponse.new(request, error, options))
       end
 
+      connections
+    end
+
+    def receive_requests(requests, connections, options)
       responses = []
 
       begin
         # guarantee ordered responses
         loop do
           request = requests.first
-          pool.next_tick until (response = fetch_response(request, connections, request_options))
+          pool.next_tick until (response = fetch_response(request, connections, options))
 
           responses << response
           requests.shift
@@ -208,7 +218,7 @@ module HTTPX
           # 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)
+            responses << fetch_response(request, connections, options)
           end
           break
         end

data/lib/httpx/transcoder/chunker.rb

@@ -20,7 +20,7 @@ module HTTPX::Transcoder
         @raw.each do |chunk|
           yield "#{chunk.bytesize.to_s(16)}#{CRLF}#{chunk}#{CRLF}"
         end
-        yield "0#{CRLF}#{CRLF}"
+        yield "0#{CRLF}"
       end
 
       def respond_to_missing?(meth, *args)

data/lib/httpx/version.rb

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

data/sig/callbacks.rbs

@@ -6,8 +6,10 @@ module HTTPX
   module Callbacks
     def on: (Symbol) { (*untyped) -> void } -> void
     def once: (Symbol) { (*untyped) -> void } -> void
+    def only: (Symbol) { (*untyped) -> void } -> void
     def emit: (Symbol, *untyped) -> void
 
+    def callbacks_for?: (Symbol) -> bool
     def callbacks: () -> Hash[Symbol, Array[_Callable]]
                   | (Symbol) -> Array[_Callable]
   end

data/sig/connection/http1.rbs

@@ -52,7 +52,7 @@ module HTTPX
 
     def disable_pipelining: () -> void
 
-    def set_protocol_headers: (Request) -> void
+    def set_protocol_headers: (Request) -> _Each[headers_key, String]
 
     def headline_uri: (Request) -> String
 
@@ -60,6 +60,10 @@ module HTTPX
 
     def join_headers: (Request request) -> void
 
+    def join_trailers: (Request request) -> void
+
+    def join_headers2: (_Each[headers_key, String] headers) -> void
+
     def join_body: (Request request) -> void
 
     def capitalized: (String field) -> String

data/sig/connection/http2.rbs

@@ -43,7 +43,7 @@ module HTTPX
 
     def headline_uri: (Request) -> String
 
-    def set_protocol_headers: (Request) -> void
+    def set_protocol_headers: (Request) -> _Each[headers_key, String]
 
     def handle: (Request request, HTTP2Next::Stream stream) -> void
 
@@ -53,13 +53,17 @@ module HTTPX
 
     def join_headers: (HTTP2Next::Stream stream, Request request) -> void
 
+    def join_trailers: (HTTP2Next::Stream stream, Request request) -> void
+
     def join_body: (HTTP2Next::Stream stream, Request request) -> void
 
     def on_stream_headers: (HTTP2Next::Stream stream, Request request, Array[[String, String]] headers) -> void
 
+    def on_stream_trailers: (HTTP2Next::Stream stream, Request request, Array[[String, String]] headers) -> void
+
     def on_stream_data: (HTTP2Next::Stream stream, Request request, string data) -> void
 
-    def on_stream_close: (HTTP2Next::Stream stream, Request request, Symbol? error) -> void
+    def on_stream_close: (HTTP2Next::Stream stream, Request request, (Symbol | StandardError)? error) -> void
 
     def on_frame: (string bytes) -> void
 

data/sig/headers.rbs

@@ -14,8 +14,8 @@ module HTTPX
     def add: (headers_key field, string value) -> void
     def delete: (headers_key field) -> void
 
-    def each: () { (headers_key, String) -> void } -> void
-            | () -> Enumerable[[headers_key, String], void]
+    def each: (?_Each[headers_key, String]? extra_headers) { (headers_key, String) -> void } -> void
+            | (?_Each[headers_key, String]? extra_headers) -> Enumerable[[headers_key, String], void]
 
     def get: (headers_key field) -> Array[String]
     def key?: (headers_key downcased_key) -> bool

data/sig/options.rbs

@@ -5,16 +5,23 @@ module HTTPX
     WINDOW_SIZE: Integer
     MAX_BODY_THRESHOLD_SIZE: Integer
 
+    type timeout_type = :connect_timeout  | :operation_timeout | :keep_alive_timeout | :total_timeout
+    type timeout = Hash[timeout_type, Numeric?]
+
     def self.new: (options) -> instance
                 | () -> instance
 
+    # headers
+    attr_reader uri: URI?
+    def uri=: (uri) -> void
+
     # headers
     attr_reader headers: Headers?
     def headers=: (headers) -> void
 
     # timeout
-    attr_reader timeout: Timeout?
-    def timeout=: (Hash[Symbol, untyped] | Timeout) -> void
+    attr_reader timeout: timeout
+    def timeout=: (timeout) -> void
 
     # max_concurrent_requests
     attr_reader max_concurrent_requests: Integer?

data/sig/plugins/aws_sdk_authentication.rbs

@@ -7,6 +7,8 @@ module HTTPX
 
       def self.load_dependencies: (singleton(Session)) -> void
 
+      def self.configure: (singleton(Session)) -> void
+
       def self.extra_options: (Options) -> (Options)
 
       module InstanceMethods

data/sig/plugins/basic_authentication.rbs

@@ -3,6 +3,8 @@ module HTTPX
     module BasicAuthentication
       def self.load_dependencies: (singleton(Session)) -> void
 
+      def self.configure: (singleton(Session)) -> void
+
       module InstanceMethods
         def basic_authentication: (string user, string password) -> instance
       end

data/sig/plugins/compression.rbs

@@ -6,8 +6,8 @@ module HTTPX
       type deflatable = _Reader | _ToS
 
       interface _Deflater
-        def deflate: (deflatable, _Writer, chunk_size: Integer) -> void
-                   | (deflatable, _Writer, chunk_size: Integer) { (String) -> void } -> void
+        def deflate: (deflatable, ?_Writer, ?chunk_size: Integer) -> _ToS
+                   | (deflatable, ?_Writer, ?chunk_size: Integer) { (String) -> void } -> _ToS
       end
 
       interface _Inflater

data/sig/plugins/multipart.rbs

@@ -33,7 +33,7 @@ module HTTPX
       end
 
       module Part
-        def self?.call: (multipart_nested_value) -> ([_Reader, String, String?] | [_Reader, String])
+        def self?.call: (multipart_nested_value) -> ([_Reader, String, String?])
       end
 
       module MimeTypeDetector

data/sig/plugins/stream.rbs

@@ -1,4 +1,21 @@
 module HTTPX
+  class StreamResponse
+    include _ToS
+
+    def each: () { (String) -> void } -> void
+            | () -> Enumerable[String]
+
+    def each_line: () { (String) -> void } -> void
+                 | () -> Enumerable[String]
+
+    def on_chunk: (string) -> void
+
+    private
+
+    def response: () -> response
+    def initialize: (Request, Session, Array[Connection]) -> untyped
+  end
+
   module Plugins
     module Stream
       module InstanceMethods
@@ -16,22 +33,6 @@ module HTTPX
         def stream: () -> StreamResponse?
       end
 
-      class StreamResponse
-        include _ToS
-
-        def each: () { (String) -> void } -> void
-                | () -> Enumerable[String]
-
-        def each_line: () { (String) -> void } -> void
-                     | () -> Enumerable[String]
-
-        def on_chunk: (string) -> void
-
-        private
-
-        def response: () -> response
-        def initialize: (Request, Session) -> untyped
-      end
     end
 
     type sessionStream = Session & Plugins::Stream::InstanceMethods

data/sig/request.rbs

@@ -11,7 +11,8 @@ module HTTPX
     attr_reader body: Body
     attr_reader state: Symbol
     attr_reader options: Options
-    attr_reader response: Response?
+    attr_reader response: response?
+    attr_reader drain_error: StandardError?
 
     def initialize: (verb | String, uri, ?options?) -> untyped
 
@@ -21,7 +22,7 @@ module HTTPX
 
     def scheme: () -> ("http" | "https")
 
-    def response=: (Response response) -> void
+    def response=: (response) -> void
 
     def path: () -> String
 
@@ -39,6 +40,10 @@ module HTTPX
 
     def expects?: () -> boolish
 
+    def trailers: () -> Headers
+
+    def trailers?: () -> boolish
+
     class Body
       def initialize: (Headers, Options) -> untyped
       def each: () { (String) -> void } -> void

data/sig/response.rbs

@@ -47,6 +47,7 @@ module HTTPX
       def empty?: () -> bool
       def copy_to: (_ToPath | _Writer destination) -> void
       def close: () -> void
+      def closed?: () -> bool
 
       private
 

data/sig/session.rbs

@@ -45,5 +45,9 @@ module HTTPX
     def build_connection: (URI, Options) -> Connection
 
     def send_requests: (*Request, options) -> Array[response]
+
+    def _send_requests: (Array[Request], options) -> Array[Connection]
+
+    def receive_requests: (Array[Request], Array[Connection], options) -> Array[response]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: timers
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +60,11 @@ extra_rdoc_files:
 - doc/release_notes/0_11_3.md
 - doc/release_notes/0_12_0.md
 - doc/release_notes/0_13_0.md
+- doc/release_notes/0_13_1.md
+- doc/release_notes/0_13_2.md
+- doc/release_notes/0_14_0.md
+- doc/release_notes/0_14_1.md
+- doc/release_notes/0_14_2.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -99,6 +104,11 @@ files:
 - doc/release_notes/0_11_3.md
 - doc/release_notes/0_12_0.md
 - doc/release_notes/0_13_0.md
+- doc/release_notes/0_13_1.md
+- doc/release_notes/0_13_2.md
+- doc/release_notes/0_14_0.md
+- doc/release_notes/0_14_1.md
+- doc/release_notes/0_14_2.md
 - doc/release_notes/0_1_0.md
 - doc/release_notes/0_2_0.md
 - doc/release_notes/0_2_1.md
@@ -163,6 +173,9 @@ files:
 - lib/httpx/plugins/digest_authentication.rb
 - lib/httpx/plugins/expect.rb
 - lib/httpx/plugins/follow_redirects.rb
+- lib/httpx/plugins/grpc.rb
+- lib/httpx/plugins/grpc/call.rb
+- lib/httpx/plugins/grpc/message.rb
 - lib/httpx/plugins/h2c.rb
 - lib/httpx/plugins/internal_telemetry.rb
 - lib/httpx/plugins/multipart.rb
@@ -192,7 +205,6 @@ files:
 - lib/httpx/response.rb
 - lib/httpx/selector.rb
 - lib/httpx/session.rb
-- lib/httpx/timeout.rb
 - lib/httpx/transcoder.rb
 - lib/httpx/transcoder/body.rb
 - lib/httpx/transcoder/chunker.rb
@@ -251,7 +263,6 @@ files:
 - sig/response.rbs
 - sig/selector.rbs
 - sig/session.rbs
-- sig/timeout.rbs
 - sig/transcoder.rbs
 - sig/transcoder/body.rbs
 - sig/transcoder/chunker.rbs
@@ -280,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: HTTPX, to the future, and beyond

data/lib/httpx/timeout.rb

@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-
-require "timeout"
-
-module HTTPX
-  class Timeout
-    CONNECT_TIMEOUT = 60
-    OPERATION_TIMEOUT = 60
-    KEEP_ALIVE_TIMEOUT = 20
-
-    def self.new(opts = {})
-      return opts if opts.is_a?(Timeout)
-
-      super(**opts)
-    end
-
-    attr_reader :connect_timeout, :operation_timeout, :keep_alive_timeout, :total_timeout
-
-    def initialize(connect_timeout: CONNECT_TIMEOUT,
-                   operation_timeout: OPERATION_TIMEOUT,
-                   keep_alive_timeout: KEEP_ALIVE_TIMEOUT,
-                   total_timeout: nil,
-                   loop_timeout: nil)
-      @connect_timeout = connect_timeout
-      @operation_timeout = operation_timeout
-      @keep_alive_timeout = keep_alive_timeout
-      @total_timeout = total_timeout
-
-      return unless loop_timeout
-
-      # :nocov:
-      warn ":loop_timeout is deprecated, use :operation_timeout instead"
-      @operation_timeout = loop_timeout
-      # :nocov:
-    end
-
-    def ==(other)
-      if other.is_a?(Timeout)
-        @connect_timeout == other.instance_variable_get(:@connect_timeout) &&
-          @operation_timeout == other.instance_variable_get(:@operation_timeout) &&
-          @keep_alive_timeout == other.instance_variable_get(:@keep_alive_timeout) &&
-          @total_timeout == other.instance_variable_get(:@total_timeout)
-      else
-        super
-      end
-    end
-
-    def merge(other)
-      case other
-      when Hash
-        timeout = Timeout.new(other)
-        merge(timeout)
-      when Timeout
-        connect_timeout = other.instance_variable_get(:@connect_timeout) || @connect_timeout
-        operation_timeout = other.instance_variable_get(:@operation_timeout) || @operation_timeout
-        keep_alive_timeout = other.instance_variable_get(:@keep_alive_timeout) || @keep_alive_timeout
-        total_timeout = other.instance_variable_get(:@total_timeout) || @total_timeout
-        Timeout.new(connect_timeout: connect_timeout,
-                    operation_timeout: operation_timeout,
-                    keep_alive_timeout: keep_alive_timeout,
-                    total_timeout: total_timeout)
-      else
-        raise ArgumentError, "can't merge with #{other.class}"
-      end
-    end
-  end
-end