httpx 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54a10e717268eab1bd790ceb5488f7641814e96f0edc7ff2252d020a73f956d4
-  data.tar.gz: fac249b2c424c310e8535bdd8940dfeec194b5438e30876da6a3875f349d49ab
+  metadata.gz: 1db39d0b49e7ad0f70dabb1190f02f26042b6285119cc8bb9db58b1446faed5a
+  data.tar.gz: 53b392efd38a8b2882db5eb348bb988fad88995fb5158fcf8f1556351531e343
 SHA512:
-  metadata.gz: 044c55f050be59ec7ef78bde8529b1957d120538c89d1488991b07d87cc60b34c66999861fe48b01719e712dd7ab1f03f349890e4ccc074303788b30798a5a90
-  data.tar.gz: 0a6b3a24a7d35e7cba39df0b58519b15c15361a96a2e458a1a0bab890a62922ed0cb34881cc506031d8be4a95505444e1401f4570f5d5286372baea548d4b2be
+  metadata.gz: f747f05af1955d0ce477dead370b4a037e26179732a93ea04fd679fc019c9d7a0ed503e8d79cc1e276bbd7be594dc6d77bb506ced0144ad9d1f3eecc40497a68
+  data.tar.gz: b9d6f55f793f3d9f7cf39957161381642ede2c90aca416f98d26264bb5324f2a774ce7ece3ad67ad194264a16a9a2dc65eeada8d4c41d49566b965a45cd8dc3b

data/lib/httpx/chainable.rb

@@ -28,13 +28,20 @@ module HTTPX
       branch(default_options).wrap(&blk)
     end
 
-    def plugin(*plugins)
+    def plugin(*args, **opts)
       klass = is_a?(Session) ? self.class : Session
       klass = Class.new(klass)
       klass.instance_variable_set(:@default_options, klass.default_options.merge(default_options))
-      klass.plugins(plugins).new
+      klass.plugin(*args, **opts).new
+    end
+
+    # deprecated
+    def plugins(*args, **opts)
+      klass = is_a?(Session) ? self.class : Session
+      klass = Class.new(klass)
+      klass.instance_variable_set(:@default_options, klass.default_options.merge(default_options))
+      klass.plugins(*args, **opts).new
     end
-    alias_method :plugins, :plugin
 
     def with(options, &blk)
       branch(default_options.merge(options), &blk)

data/lib/httpx/connection/http1.rb

@@ -54,14 +54,6 @@ module HTTPX
       handle(request)
     end
 
-    def reenqueue!
-      requests = @requests.dup
-      @requests.clear
-      requests.each do |request|
-        send(request)
-      end
-    end
-
     def consume
       @requests.each do |request|
         handle(request)

data/lib/httpx/connection/http2.rb

@@ -54,15 +54,6 @@ module HTTPX
       true
     end
 
-    def reenqueue!
-      requests = @streams.keys
-      @streams.clear
-      init_connection
-      requests.each do |request|
-        send(request)
-      end
-    end
-
     def consume
       @streams.each do |request, stream|
         handle(request, stream)

data/lib/httpx/plugins/proxy.rb

@@ -134,6 +134,12 @@ module HTTPX
           end
           response
         end
+
+        def build_altsvc_connection(_, _, _, _, options)
+          return if options.proxy
+
+          super
+        end
       end
 
       module ConnectionMethods

data/lib/httpx/plugins/retries.rb

@@ -25,6 +25,17 @@ module HTTPX
 
       def self.extra_options(options)
         Class.new(options.class) do
+          # number of seconds after which one can retry the request
+          def_option(:retry_after) do |num|
+            # return early if callable
+            return num if num.respond_to?(:call)
+
+            num = Integer(num)
+            raise Error, ":retry_after must be positive" unless num.positive?
+
+            num
+          end
+
           def_option(:max_retries) do |num|
             num = Integer(num)
             raise Error, ":max_retries must be positive" unless num.positive?
@@ -33,6 +44,12 @@ module HTTPX
           end
 
           def_option(:retry_change_requests)
+
+          def_option(:retry_on) do |callback|
+            raise ":retry_on must be called with the response" unless callback.respond_to?(:call) && callback.method(:call).arity == 1
+
+            callback
+          end
         end.new(options).merge(max_retries: MAX_RETRIES)
       end
 
@@ -45,16 +62,19 @@ module HTTPX
 
         def fetch_response(request, connections, options)
           response = super
+
+          retry_on = options.retry_on
+
           if response.is_a?(ErrorResponse) &&
              request.retries.positive? &&
              __repeatable_request?(request, options) &&
-             __retryable_error?(response.error)
+             __retryable_error?(response.error) &&
+             (!retry_on || retry_on.call(response))
             request.retries -= 1
             log { "failed to get response, #{request.retries} tries to go..." }
             request.transition(:idle)
             connection = find_connection(request, connections, options)
-            connection.send(request)
-            set_request_timeout(connection, request, options)
+            __retry_request(connection, request, options)
             return
           end
           response
@@ -67,6 +87,23 @@ module HTTPX
         def __retryable_error?(ex)
           RETRYABLE_ERRORS.any? { |klass| ex.is_a?(klass) }
         end
+
+        def __retry_request(connection, request, options)
+          retry_after = options.retry_after
+          unless retry_after
+            connection.send(request)
+            set_request_timeout(connection, request, options)
+            return
+          end
+
+          retry_after = retry_after.call(request) if retry_after.respond_to?(:call)
+          log { "retrying after #{retry_after} secs..." }
+          pool.after(retry_after) do
+            log { "retrying!!" }
+            connection.send(request)
+            set_request_timeout(connection, request, options)
+          end
+        end
       end
 
       module RequestMethods

data/lib/httpx/resolver/https.rb

@@ -172,14 +172,15 @@ module HTTPX
     def build_request(hostname, type)
       uri = @uri.dup
       rklass = @options.request_class
+      payload = Resolver.encode_dns_query(hostname, type: RECORD_TYPES[type])
+
       if @resolver_options.use_get
         params = URI.decode_www_form(uri.query.to_s)
         params << ["type", type]
-        params << ["name", CGI.escape(hostname)]
+        params << ["dns", Base64.urlsafe_encode64(payload, padding: false)]
         uri.query = URI.encode_www_form(params)
         request = rklass.new("GET", uri, @options)
       else
-        payload = Resolver.encode_dns_query(hostname, type: RECORD_TYPES[type])
         request = rklass.new("POST", uri, @options.merge(body: [payload]))
         request.headers["content-type"] = "application/dns-message"
       end

data/lib/httpx/session.rb

@@ -251,12 +251,15 @@ module HTTPX
         self
       end
 
+      # :nocov:
       def plugins(pls)
+        warn ":#{__method__} is deprecated, use :plugin instead"
         pls.each do |pl, *args|
           plugin(pl, *args)
         end
         self
       end
+      # :nocov:
     end
 
     plugin(:proxy) unless ENV.grep(/https?_proxy$/i).empty?

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2-next