httpx 0.6.7 → 0.9.0

data/lib/httpx/session.rb

@@ -5,7 +5,9 @@ module HTTPX
     include Loggable
     include Chainable
 
-    def initialize(options = {}, &blk)
+    EMPTY_HASH = {}.freeze
+
+    def initialize(options = EMPTY_HASH, &blk)
       @options = self.class.default_options.merge(options)
       @responses = {}
       @persistent = @options.persistent
@@ -29,13 +31,21 @@ module HTTPX
     end
 
     def request(*args, **options)
-      requests = build_requests(*args, options)
+      requests = args.first.is_a?(Request) ? args : build_requests(*args, options)
       responses = send_requests(*requests, options)
       return responses.first if responses.size == 1
 
       responses
     end
 
+    def build_request(verb, uri, options = EMPTY_HASH)
+      rklass = @options.request_class
+      request = rklass.new(verb, uri, @options.merge(options).merge(persistent: @persistent))
+      request.on(:response, &method(:on_response).curry[request])
+      request.on(:promise, &method(:on_promise))
+      request
+    end
+
     private
 
     def pool
@@ -47,7 +57,7 @@ module HTTPX
     end
 
     def on_promise(_, stream)
-      log(level: 2, label: "#{stream.id}: ") { "refusing stream!" }
+      log(level: 2) { "#{stream.id}: refusing stream!" }
       stream.refuse
     end
 
@@ -60,22 +70,33 @@ module HTTPX
       connection = pool.find_connection(uri, options) || build_connection(uri, options)
       unless connections.nil? || connections.include?(connection)
         connections << connection
-        set_connection_callbacks(connection, options)
+        set_connection_callbacks(connection, connections, options)
       end
       connection
     end
 
-    def set_connection_callbacks(connection, options)
+    def set_connection_callbacks(connection, connections, options)
       connection.on(:uncoalesce) do |uncoalesced_uri|
         other_connection = build_connection(uncoalesced_uri, options)
+        connections << other_connection
         connection.unmerge(other_connection)
       end
       connection.on(:altsvc) do |alt_origin, origin, alt_params|
-        build_altsvc_connection(connection, alt_origin, origin, alt_params, options)
+        other_connection = build_altsvc_connection(connection, connections, alt_origin, origin, alt_params, options)
+        connections << other_connection if other_connection
+      end
+      connection.on(:exhausted) do
+        other_connection = connection.create_idle
+        other_connection.merge(connection)
+        catch(:coalesced) do
+          pool.init_connection(other_connection, options)
+        end
+        set_connection_callbacks(other_connection, connections, options)
+        connections << other_connection
       end
     end
 
-    def build_altsvc_connection(existing_connection, alt_origin, origin, alt_params, options)
+    def build_altsvc_connection(existing_connection, connections, alt_origin, origin, alt_params, options)
       altsvc = AltSvc.cached_altsvc_set(origin, alt_params.merge("origin" => alt_origin))
 
       # altsvc already exists, somehow it wasn't advertised, probably noop
@@ -85,7 +106,7 @@ module HTTPX
       # advertised altsvc is the same origin being used, ignore
       return if connection == existing_connection
 
-      set_connection_callbacks(connection, options)
+      set_connection_callbacks(connection, connections, options)
 
       log(level: 1) { "#{origin} alt-svc: #{alt_origin}" }
 
@@ -99,8 +120,10 @@ module HTTPX
       end
 
       connection.merge(existing_connection)
+      connection
     rescue UnsupportedSchemeError
       altsvc["noop"] = true
+      nil
     end
 
     def build_requests(*args, options)
@@ -109,8 +132,8 @@ module HTTPX
       requests = case args.size
                  when 1
                    reqs = args.first
-                   reqs.map do |verb, uri|
-                     build_request(verb, uri, request_options)
+                   reqs.map do |verb, uri, opts = EMPTY_HASH|
+                     build_request(verb, uri, request_options.merge(opts))
                    end
                  when 2, 3
                    verb, uris = args
@@ -155,7 +178,6 @@ module HTTPX
         error = catch(:resolve_error) do
           connection = find_connection(request, connections, request_options)
           connection.send(request)
-          set_request_timeout(connection, request, request_options)
         end
         next unless error.is_a?(ResolveError)
 
@@ -183,29 +205,6 @@ module HTTPX
       end
     end
 
-    def build_request(verb, uri, options)
-      rklass = @options.request_class
-      request = rklass.new(verb, uri, @options.merge(options))
-      request.on(:response, &method(:on_response).curry[request])
-      request.on(:promise, &method(:on_promise))
-      request
-    end
-
-    def set_request_timeout(connection, request, options)
-      total = options.timeout.total_timeout
-      return unless total
-
-      timer = pool.after(total) do
-        unless @responses[request]
-          error = TotalTimeoutError.new(total, "Timed out after #{total} seconds")
-          response = ErrorResponse.new(request, error, options)
-          request.emit(:response, response)
-          connection.reset
-        end
-      end
-      request.timer = timer
-    end
-
     @default_options = Options.new
     @default_options.freeze
     @plugins = []

data/lib/httpx/timeout.rb

@@ -6,6 +6,7 @@ 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)
@@ -13,14 +14,16 @@ module HTTPX
       super(**opts)
     end
 
-    attr_reader :connect_timeout, :operation_timeout, :total_timeout
+    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
@@ -35,6 +38,7 @@ module HTTPX
       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
@@ -49,9 +53,11 @@ module HTTPX
       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}"

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.9.0
 platform: ruby
 authors:
 - Tiago Cardoso
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http-cookie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: http-form_data
   requirement: !ruby/object:Gem::Requirement
@@ -58,29 +72,71 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: http-cookie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: A client library for making HTTP requests from Ruby.
 email:
 - cardoso_tiago@hotmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE.txt
+- README.md
+- doc/release_notes/0_0_1.md
+- doc/release_notes/0_1_0.md
+- doc/release_notes/0_0_5.md
+- doc/release_notes/0_0_4.md
+- doc/release_notes/0_6_5.md
+- doc/release_notes/0_6_1.md
+- doc/release_notes/0_7_0.md
+- doc/release_notes/0_6_0.md
+- doc/release_notes/0_8_2.md
+- doc/release_notes/0_6_4.md
+- doc/release_notes/0_9_0.md
+- doc/release_notes/0_6_3.md
+- doc/release_notes/0_8_1.md
+- doc/release_notes/0_5_0.md
+- doc/release_notes/0_6_7.md
+- doc/release_notes/0_4_1.md
+- doc/release_notes/0_5_1.md
+- doc/release_notes/0_6_6.md
+- doc/release_notes/0_4_0.md
+- doc/release_notes/0_6_2.md
+- doc/release_notes/0_8_0.md
+- doc/release_notes/0_3_0.md
+- doc/release_notes/0_2_1.md
+- doc/release_notes/0_0_3.md
+- doc/release_notes/0_0_2.md
+- doc/release_notes/0_3_1.md
+- doc/release_notes/0_2_0.md
 files:
 - LICENSE.txt
 - README.md
+- doc/release_notes/0_0_1.md
+- doc/release_notes/0_0_2.md
+- doc/release_notes/0_0_3.md
+- doc/release_notes/0_0_4.md
+- doc/release_notes/0_0_5.md
+- doc/release_notes/0_1_0.md
+- doc/release_notes/0_2_0.md
+- doc/release_notes/0_2_1.md
+- doc/release_notes/0_3_0.md
+- doc/release_notes/0_3_1.md
+- doc/release_notes/0_4_0.md
+- doc/release_notes/0_4_1.md
+- doc/release_notes/0_5_0.md
+- doc/release_notes/0_5_1.md
+- doc/release_notes/0_6_0.md
+- doc/release_notes/0_6_1.md
+- doc/release_notes/0_6_2.md
+- doc/release_notes/0_6_3.md
+- doc/release_notes/0_6_4.md
+- doc/release_notes/0_6_5.md
+- doc/release_notes/0_6_6.md
+- doc/release_notes/0_6_7.md
+- doc/release_notes/0_7_0.md
+- doc/release_notes/0_8_0.md
+- doc/release_notes/0_8_1.md
+- doc/release_notes/0_8_2.md
+- doc/release_notes/0_9_0.md
 - lib/httpx.rb
 - lib/httpx/adapters/faraday.rb
 - lib/httpx/altsvc.rb
@@ -109,6 +165,7 @@ files:
 - lib/httpx/plugins/compression/gzip.rb
 - lib/httpx/plugins/cookies.rb
 - lib/httpx/plugins/digest_authentication.rb
+- lib/httpx/plugins/expect.rb
 - lib/httpx/plugins/follow_redirects.rb
 - lib/httpx/plugins/h2c.rb
 - lib/httpx/plugins/multipart.rb
@@ -148,7 +205,7 @@ metadata:
   changelog_uri: https://honeyryderchuck.gitlab.io/httpx/#release-notes
   documentation_uri: https://honeyryderchuck.gitlab.io/httpx/rdoc/
   source_code_uri: https://gitlab.com/honeyryderchuck/httpx
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: HTTPX, to the future, and beyond
 test_files: []