iproto 0.3.3 → 0.3.6

data/iproto.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'iproto'
-  s.version           = '0.3.3'
-  s.date              = '2012-07-06'
+  s.version           = '0.3.6'
+  s.date              = '2012-07-18'
   s.rubyforge_project = 'iproto'
 
   s.summary     = "Mail.Ru simple network protocol"

data/lib/iproto/connection_api.rb

@@ -1,6 +1,9 @@
 module IProto
   module ConnectionAPI
     PACK = 'VVV'.freeze
+    DEFAULT_RECONNECT = 0.1
+    HEADER_SIZE = 12
+
     def next_request_id
       @next_request_id = ((@next_request_id ||= 0) + 1) & 0x7fffffff
     end

data/lib/iproto/core-ext.rb

@@ -1,3 +1,4 @@
+require 'fiber'
 class Fiber
   alias call resume
 end

data/lib/iproto/em.rb

@@ -3,7 +3,7 @@ require 'fiber'
 require 'iproto/core-ext'
 
 module IProto
-  module EM
+  class EMConnection < ::EM::Connection
     module FixedLengthProtocol
       def post_init
         raise "you should set @_needed_size"  unless @_needed_size
@@ -28,36 +28,50 @@ module IProto
       end
     end
 
-  class Connection < ::EM::Connection
     include IProto::ConnectionAPI
     include FixedLengthProtocol
-    HEADER_SIZE = 12
+
+    attr_reader :host, :port
 
     def initialize(host, port, reconnect = true)
       @host = host
       @port = port
+      @reconnect_timeout = Numeric === reconnect ? reconnect : DEFAULT_RECONNECT
       @should_reconnect = !!reconnect
       @reconnect_timer = nil
-      @connected = false
+      @connected = :init_waiting
       @waiting_requests = {}
       @waiting_for_connect = []
       init_protocol
+      @shutdown_hook = false
+      shutdown_hook
+    end
+
+    def connected?
+      @connected == true
+    end
+
+    def could_be_connected?
+      @connected && (@connected != :force || ::EM.reactor_running?)
     end
 
     def shutdown_hook
-      ::EM.add_shutdown_hook {
-        @connected = false
-        if @reconnect_timer && !(Symbol === @reconnect_timer)
-          ::EM.cancel_timer @reconnect_timer
-        end
-        @reconnect_timer = @should_reconnect ? :force : nil
-      }
+      unless @shutdown_hook
+        ::EM.add_shutdown_hook {
+          @connected = @should_reconnect ? :force : false
+          if Integer === @reconnect_timer
+            ::EM.cancel_timer @reconnect_timer
+          end
+          @reconnect_timer = nil
+          @shutdown_hook = false
+        }
+        @shutdown_hook = true
+      end
     end
 
     def connection_completed
       @reconnect_timer = nil
       @connected = true
-      shutdown_hook
       _perform_waiting_for_connect(true)
     end
 
@@ -70,15 +84,19 @@ module IProto
     def receive_chunk(chunk)
       if @_state == :receive_header
         @type, body_size, @request_id = chunk.unpack(PACK)
-        @_needed_size = body_size
-        @_state = :receive_body
-      else
-        request = @waiting_requests.delete @request_id
-        raise IProto::UnexpectedResponse.new("For request id #{@request_id}") unless request
-        @_needed_size = HEADER_SIZE
-        @_state = :receive_header
-        do_response(request, chunk)
+        if body_size > 0
+          @_needed_size = body_size
+          @_state = :receive_body
+          return
+        else
+          chunk = ''
+        end
       end
+      request = @waiting_requests.delete @request_id
+      raise IProto::UnexpectedResponse.new("For request id #{@request_id}") unless request
+      @_needed_size = HEADER_SIZE
+      @_state = :receive_header
+      do_response(request, chunk)
     end
 
     def do_response(request, data)
@@ -86,9 +104,11 @@ module IProto
     end
 
     def _setup_reconnect_timer(timeout)
-      if @reconnect_timer.nil? || @reconnect_timer == :force
+      if @reconnect_timer.nil?
         @reconnect_timer = :waiting
-        if @timeout == 0
+        shutdown_hook
+        if timeout == 0
+          @connected = :waiting
           reconnect @host, @port
         else
           @reconnect_timer = ::EM.add_timer(timeout) do
@@ -99,22 +119,28 @@ module IProto
     end
 
     def _send_request(request_type, body, request)
-      unless @connected
-        unless @should_reconnect
-          raise IProto::Disconnected.new("connection is closed")  if @should_reconnect.nil?
-        else
-          @waiting_for_connect << [request_type, body, request]
+      if @connected == true
+        _do_send_request(request_type, body, request)
+      elsif could_be_connected?
+        @waiting_for_connect << [request_type, body, request]
+        if @connected == :force
           _setup_reconnect_timer(0)
         end
+      elsif ::EM.reactor_running?
+        EM.next_tick{
+          do_response(request, IProto::Disconnected.new("connection is closed"))
+        }
       else
-        _do_send_request(request_type, body, request)
+        do_response(request, IProto::Disconnected.new("connection is closed"))
       end
     end
 
     def _perform_waiting_for_connect(real)
       if real
         @waiting_for_connect.each do |request_type, body, request|
+          ::EM.next_tick{
           _do_send_request(request_type, body, request)
+          }
         end
       else
         i = -1
@@ -138,13 +164,15 @@ module IProto
 
     def close_connection(*args)
       @should_reconnect = nil
-      if @reconnect_timer
-        ::EM.cancel_timer @reconnect_timer  unless Symbol === @reconnect_timer
-        @reconnect_timer = nil
+      if Integer === @reconnect_timer
+        ::EM.cancel_timer @reconnect_timer
       end
-      if @connected
+      @reconnect_timer = nil
+
+      if @connected == true
         super(*args)
       end
+      @connected = false
       discard_requests
     end
 
@@ -158,16 +186,23 @@ module IProto
     end
 
     def unbind
+      prev_connected = @connected
+      @connected = false
       discard_requests
+      @connected = prev_connected
+
       case @should_reconnect
       when true
-        @connected = false
-        _setup_reconnect_timer(0.03) unless @reconnect_timer == :force
+        @reconnect_timer = nil
+        unless @connected == :force
+          @connected = false
+          _setup_reconnect_timer(@reconnect_timeout)
+        end
       when false
-        if @connected
-          raise IProto::Disconnected
-        else
+        if @connected == :init_waiting
           raise IProto::CouldNotConnect
+        else
+          raise IProto::Disconnected
         end
       when nil
         # do nothing cause we explicitely disconnected
@@ -175,7 +210,7 @@ module IProto
     end
   end
 
-  class FiberedConnection < Connection
+  class EMFiberedConnection < EMConnection
     def send_request(request_type, body)
       _send_request(request_type, body, Fiber.current)
       result = Fiber.yield
@@ -184,11 +219,9 @@ module IProto
     end
   end
 
-  class CallbackConnection < Connection
+  class EMCallbackConnection < EMConnection
     def send_request(request_type, body, cb = nil, &block)
       _send_request(request_type, body, cb || block)
     end
   end
-
-  end
 end

data/lib/iproto/tcp_socket.rb

@@ -4,41 +4,63 @@ module IProto
   class TCPSocket
     include IProto::ConnectionAPI
     def initialize(host, port, reconnect = true)
-      @host = host
-      @port = port
-      @reconnect = true
+      @addr = [host, port]
+      @reconnect_timeout = Numeric === reconnect ? reconnect : DEFAULT_RECONNECT
+      @reconnect = !!reconnect
+      @socket = nil
+      @reconnect_time = Time.now - 1
+      @retry = true
     end
 
     def close
       @reconnect = false
       if @socket
         @socket.close rescue nil
+        @socket = :disconnected
       end
     end
 
+    def connected?
+      @socket && @socket != :disconnected
+    end
+
+    def could_be_connected?
+      @socket ? @socket != :disconnected
+              : (@retry || @reconnect_time < Time.now)
+    end
+
     def socket
-      @socket ||= ::TCPSocket.new(@host, @port)
+      if (sock = @socket)
+        sock != :disconnected ? sock : raise(Disconnected, "disconnected earlier")
+      else
+        sock = @socket = ::TCPSocket.new(*@addr)
+        @retry = true
+      end
+      sock
     rescue Errno::ECONNREFUSED => e
+      @socket = :disconnected  unless @reconnect
       raise CouldNotConnect, e
     end
 
+    class Retry < RuntimeError; end
+
     # begin ConnectionAPI
     def send_request(request_type, body)
-      request_id = next_request_id
-      r = socket.send ([request_type, body.bytesize, request_id].pack(PACK) << body), 0
-      response_size = recv_header request_id
-      recv_response response_size
-    rescue Errno::EPIPE => e
-      @socket = nil  if @reconnect
-      raise Disconnected, e
+      begin
+        request_id = next_request_id
+        r = socket.send ([request_type, body.bytesize, request_id].pack(PACK) << body), 0
+        response_size = recv_header request_id
+        recv_response response_size
+      rescue Errno::EPIPE, Retry => e
+        _raise_disconnected(e, !@retry)
+        @retry = false
+        retry
+      end
     end
     # end ConnectionAPI
 
     def recv_header(request_id)
-      header = socket.read(12)  or begin
-        @socket = nil  if @reconnect
-        raise Disconnected, 'disconnected while read'
-      end
+      header = socket.read(HEADER_SIZE)  or _raise_disconnected('disconnected while read', @retry ? :retry : true)
       type, response_size, recv_request_id = header.unpack(PACK)
       unless request_id == recv_request_id
         raise UnexpectedResponse.new("Waiting response for request_id #{request_id}, but received for #{recv_request_id}")
@@ -47,9 +69,21 @@ module IProto
     end
 
     def recv_response(response_size)
-      socket.read(response_size)  or begin
-        @socket = nil  if @reconnect
-        raise Disconnected, 'disconnected while read'
+      socket.read(response_size)  or _raise_disconnected('disconnected while read', 2)
+    end
+
+    def _raise_disconnected(message, _raise = true)
+      if @reconnect
+        @socket = nil
+        @reconnect_time = Time.now + @reconnect_timeout
+      else
+        @socket = :disconnected
+      end
+      case _raise
+      when true
+        raise Disconnected, message
+      when :retry
+        raise Retry
       end
     end
   end

data/lib/iproto.rb

@@ -1,9 +1,10 @@
 module IProto
-  VERSION = '0.3.3'
+  VERSION = '0.3.6'
   class IProtoError < StandardError; end
-  class CouldNotConnect < IProtoError; end
+  class ConnectionError < IProtoError; end
+  class CouldNotConnect < ConnectionError; end
+  class Disconnected < ConnectionError; end
   class UnexpectedResponse < IProtoError; end
-  class Disconnected < IProtoError; end
 
   require 'iproto/connection_api'
 
@@ -14,10 +15,10 @@ module IProto
     case type
     when :em
       require 'iproto/em'
-      ::EM.connect host, port, IProto::EM::FiberedConnection, host, port, reconnect
+      ::EM.connect host, port, IProto::EMFiberedConnection, host, port, reconnect
     when :em_callback
       require 'iproto/em'
-      ::EM.connect host, port, IProto::EM::CallbackConnection, host, port, reconnect
+      ::EM.connect host, port, IProto::EMCallbackConnection, host, port, reconnect
     when :block
       require 'iproto/tcp_socket'
       IProto::TCPSocket.new(host, port, reconnect)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iproto
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies: []
 description: Mail.Ru simple network protocol
 email: ceo@prepor.ru