timeout.rb in httpx-0.3.0

- old
+ new

@@ -2,32 +2,46 @@
 
 require "timeout"
 
 module HTTPX
   class Timeout
-    LOOP_TIMEOUT = 5
+    CONNECT_TIMEOUT = 60
+    OPERATION_TIMEOUT = 60
 
     def self.new(opts = {})
       return opts if opts.is_a?(Timeout)
       super
     end
 
-    def initialize(loop_timeout: LOOP_TIMEOUT, total_timeout: nil)
-      @loop_timeout = loop_timeout
+    attr_reader :connect_timeout, :operation_timeout
+
+    def initialize(connect_timeout: CONNECT_TIMEOUT,
+                   operation_timeout: OPERATION_TIMEOUT,
+                   total_timeout: nil,
+                   loop_timeout: nil)
+      @connect_timeout = connect_timeout
+      @operation_timeout = operation_timeout
       @total_timeout = total_timeout
+      if loop_timeout
+        warn ":loop_timeout is deprecated, use :operation_timeout instead"
+        @operation_timeout = loop_timeout
+      end
       reset_counter
+      @state = :idle # this is here not to trigger the log
+      transition(:idle)
     end
 
     def timeout
-      @loop_timeout || @total_timeout
+      @timeout || @total_timeout
     ensure
       log_time
     end
 
     def ==(other)
       if other.is_a?(Timeout)
-        @loop_timeout == other.instance_variable_get(:@loop_timeout) &&
+        @connect_timeout == other.instance_variable_get(:@connect_timeout) &&
+          @operation_timeout == other.instance_variable_get(:@operation_timeout) &&
           @total_timeout == other.instance_variable_get(:@total_timeout)
       else
         super
       end
     end
@@ -36,18 +50,33 @@
       case other
       when Hash
         timeout = Timeout.new(other)
         merge(timeout)
       when Timeout
-        loop_timeout = other.instance_variable_get(:@loop_timeout) || @loop_timeout
+        connect_timeout = other.instance_variable_get(:@connect_timeout) || @connect_timeout
+        operation_timeout = other.instance_variable_get(:@operation_timeout) || @operation_timeout
         total_timeout = other.instance_variable_get(:@total_timeout) || @total_timeout
-        Timeout.new(loop_timeout: loop_timeout, total_timeout: total_timeout)
+        Timeout.new(connect_timeout: connect_timeout,
+                    operation_timeout: operation_timeout,
+                    total_timeout: total_timeout)
       else
         raise ArgumentError, "can't merge with #{other.class}"
       end
     end
 
+    def transition(nextstate)
+      return if @state == nextstate
+      case nextstate
+      # when :idle
+      when :idle
+        @timeout = @connect_timeout
+      when :open
+        @timeout = @operation_timeout
+      end
+      @state = nextstate
+    end
+
     private
 
     def reset_counter
       @time_left = @total_timeout
     end
@@ -58,10 +87,10 @@
 
     def log_time
       return unless @time_left
       return reset_timer unless @started
       @time_left -= (Process.clock_gettime(Process::CLOCK_MONOTONIC) - @started)
-      raise TimeoutError, "Timed out after #{@total_timeout} seconds" if @time_left <= 0
+      raise TimeoutError.new(@total_timeout, "Timed out after #{@total_timeout} seconds") if @time_left <= 0
 
       reset_timer
     end
   end
 end