iproto 0.3.14 → 0.3.15

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.14'
-  s.date              = '2014-01-15'
+  s.version           = '0.3.15'
+  s.date              = '2014-10-27'
   s.rubyforge_project = 'iproto'
 
   s.summary     = "Mail.Ru simple network protocol"

data/lib/iproto/connection_api.rb

@@ -1,9 +1,12 @@
 require 'bin_utils'
+require 'iproto/core-ext'
 module IProto
   module ConnectionAPI
     DEFAULT_RECONNECT = 0.1
     HEADER_SIZE = 12
 
+    EMPTY_STR = ''.b.freeze
+
     def next_request_id
       @next_request_id = ((@next_request_id ||= 0) + 1) & 0x7fffffff
     end
@@ -17,5 +20,8 @@ module IProto
       data = ::BinUtils.append_int32_le!(nil, request_type, body.bytesize, request_id)
       ::BinUtils.append_string!(data, body)
     end
+
+    PING = 0xff00
+    PING_ID = 0xffffffff
   end
 end

data/lib/iproto/core-ext.rb

@@ -2,3 +2,11 @@ require 'fiber'
 class Fiber
   alias call resume
 end
+
+class String
+  unless method_defined?(:b)
+    def b
+      force_encoding(::Encoding::BINARY)
+    end
+  end
+end

data/lib/iproto/em.rb

@@ -10,14 +10,14 @@ module IProto
       end
 
       def receive_data(data)
-        @buffer ||= ''
+        @buffer ||= ''.b
         offset = 0
-        while (chunk = data[offset, _needed_size - @buffer.size]).size > 0
+        while (chunk = data.byteslice(offset, _needed_size - @buffer.bytesize)).size > 0
           @buffer << chunk
           offset += chunk.size
           if @buffer.size == _needed_size
             chunk = @buffer
-            @buffer = ''
+            @buffer = ''.b
             receive_chunk chunk
           end
         end 
@@ -26,6 +26,10 @@ module IProto
       def receive_chunk(chunk)
         # for override
       end
+
+      def buffer_reset
+        @buffer = ''.b
+      end
     end
 
     include IProto::ConnectionAPI
@@ -39,14 +43,36 @@ module IProto
       @reconnect_timeout = Numeric === reconnect ? reconnect : DEFAULT_RECONNECT
       @should_reconnect = !!reconnect
       @reconnect_timer = nil
+      @ping_timer = nil
       @connected = :init_waiting
       @waiting_requests = {}
       @waiting_for_connect = []
-      init_protocol
       @shutdown_hook = false
+      @inactivity_timeout = 0
+      init_protocol
       shutdown_hook
     end
 
+    def _start_pinger
+      if @connected == true && (cit = comm_inactivity_timeout) != 0 && @ping_timer == nil
+        @ping_timer = EM.add_periodic_timer([1, cit / 4.0].min, method(:_ping))
+      end
+    end
+
+    def _stop_pinger
+      if @ping_timer
+        @ping_timer.cancel
+        @ping_timer = nil
+      end
+    end
+
+    def comm_inactivity_timeout=(t)
+      _stop_pinger
+      @inactivity_timeout = t
+      super
+      _start_pinger
+    end
+
     def connected?
       @connected == true
     end
@@ -72,6 +98,8 @@ module IProto
     def connection_completed
       @reconnect_timer = nil
       @connected = true
+      init_protocol
+      self.comm_inactivity_timeout= @inactivity_timeout
       _perform_waiting_for_connect(true)
     end
 
@@ -79,6 +107,11 @@ module IProto
     def init_protocol
       @_needed_size = HEADER_SIZE
       @_state = :receive_header
+      buffer_reset
+    end
+
+    def _ping
+      send_data pack_request(PING, PING_ID, EMPTY_STR)
     end
 
     def receive_chunk(chunk)
@@ -93,6 +126,11 @@ module IProto
           chunk = ''
         end
       end
+      if @request_id == PING_ID
+        @_needed_size = HEADER_SIZE
+        @_state = :receive_header
+        return
+      end
       request = @waiting_requests.delete @request_id
       raise IProto::UnexpectedResponse.new("For request id #{@request_id}") unless request
       @_needed_size = HEADER_SIZE
@@ -187,6 +225,7 @@ module IProto
     end
 
     def unbind
+      _stop_pinger
       prev_connected = @connected
       @connected = false
       discard_requests

data/lib/iproto.rb

@@ -1,5 +1,5 @@
 module IProto
-  VERSION = '0.3.14'
+  VERSION = '0.3.15'
   class IProtoError < StandardError; end
   class ConnectionError < IProtoError; end
   class CouldNotConnect < ConnectionError; end

metadata

@@ -2,14 +2,14 @@
 name: iproto
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.14
+  version: 0.3.15
 platform: ruby
 authors:
 - Andrew Rudenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime