bones-rpc 0.0.2 → 0.0.3

data/lib/bones/rpc/loggable.rb

@@ -4,7 +4,7 @@ module Bones
 
     # Contains behaviour for logging.
     #
-    # @since 1.0.0
+    # @since 0.0.1
     module Loggable
 
       # Log the provided operations.
@@ -16,7 +16,7 @@ module Bones
       # @param [ Array ] ops The operations.
       # @param [ String ] runtime The runtime in formatted ms.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def self.log_operations(prefix, ops, runtime)
         indent  = " "*prefix.length
         if ops.length == 1
@@ -38,7 +38,7 @@ module Bones
       # @param [ String ] payload The log operations.
       # @param [ String ] runtime The runtime in formatted ms.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def self.debug(prefix, payload, runtime)
         Bones::RPC.logger.debug([ prefix, payload, "runtime: #{runtime}" ].join(' '))
       end
@@ -52,7 +52,7 @@ module Bones
       # @param [ String ] payload The log operations.
       # @param [ String ] runtime The runtime in formatted ms.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def self.warn(prefix, payload, runtime)
         Bones::RPC.logger.warn([ prefix, payload, "runtime: #{runtime}" ].join(' '))
       end
@@ -64,7 +64,7 @@ module Bones
       #
       # @return [ Logger ] The logger.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def logger
         return @logger if defined?(@logger)
         @logger = rails_logger || default_logger
@@ -77,7 +77,7 @@ module Bones
       #
       # @return [ Logger ] The Rails logger.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def rails_logger
         defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
       end
@@ -89,7 +89,7 @@ module Bones
       #
       # @return [ Logger ] The default logger.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def default_logger
         logger = Logger.new(STDOUT)
         logger.level = Logger::INFO
@@ -103,7 +103,7 @@ module Bones
       #
       # @return [ Logger ] The logger.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def logger=(logger)
         @logger = logger
       end

data/lib/bones/rpc/node.rb

@@ -2,7 +2,6 @@
 require 'bones/rpc/address'
 require 'bones/rpc/connection'
 require 'bones/rpc/failover'
-require 'bones/rpc/future'
 require 'bones/rpc/instrumentable'
 require 'bones/rpc/node/registry'
 
@@ -11,9 +10,8 @@ module Bones
 
     # Represents a client to a node in a server cluster.
     #
-    # @since 1.0.0
+    # @since 0.0.1
     class Node
-      include Celluloid
       include Instrumentable
 
       # @!attribute address
@@ -37,15 +35,15 @@ module Bones
       #
       # @return [ true, false ] If the addresses are equal.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def ==(other)
         return false unless other.is_a?(Node)
-        id == other.id
+        address.resolved == other.address.resolved
       end
       alias :eql? :==
 
       def adapter
-        @adapter ||= Adapter.get(options[:adapter] || :msgpack)
+        @adapter ||= Adapter.get(options[:adapter] || :json)
       end
 
       def attach(channel, id, future)
@@ -65,10 +63,10 @@ module Bones
       #
       # @return [ true ] If the connection suceeded.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def connect
         start = Time.now
-        @connection.connect
+        connection { |conn| conn.connect }
         @latency = Time.now - start
         @down_at = nil
         true
@@ -81,9 +79,17 @@ module Bones
       #
       # @return [ true, false ] If the node is connected or not.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def connected?
-        @connection.alive?
+        connection { |conn| conn.alive? }
+      end
+
+      def connection
+        if block_given?
+          yield @connection
+        else
+          @connection
+        end
       end
 
       def detach(channel, id)
@@ -97,9 +103,9 @@ module Bones
       #
       # @return [ true ] If the disconnection succeeded.
       #
-      # @since 1.2.0
+      # @since 0.0.1
       def disconnect
-        @connection.disconnect
+        connection { |conn| conn.disconnect }
         true
       end
 
@@ -110,7 +116,7 @@ module Bones
       #
       # @return [ Time, nil ] The time the node went down, or nil if up.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def down?
         !!@down_at
       end
@@ -122,7 +128,7 @@ module Bones
       #
       # @return [ nil ] Nothing.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def down
         @down_at = Time.new
         @latency = nil
@@ -141,7 +147,7 @@ module Bones
       #
       # @return [ nil ] nil.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def ensure_connected(&block)
         begin
           connect unless connected?
@@ -162,7 +168,7 @@ module Bones
       def initialize(cluster, address)
         @cluster = cluster
         @address = address
-        @connection = Connection.new(current_actor)
+        @connection = cluster.session.backend.connection_class.new(current_actor)
         @down_at = nil
         @refreshed_at = nil
         @latency = nil
@@ -170,7 +176,7 @@ module Bones
         @registry = Node::Registry.new
         @request_id = 0
         @synack_id = 0
-        @address.resolve(self)
+        @address.resolve(current_actor)
       end
 
       # Get the node as a nice formatted string.
@@ -180,7 +186,7 @@ module Bones
       #
       # @return [ String ] The string inspection.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def inspect
         "<#{self.class.name} resolved_address=#{address.resolved.inspect}>"
       end
@@ -194,7 +200,7 @@ module Bones
       #
       # @return [ true, false] Whether the node needs to be refreshed.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def needs_refresh?(time)
         !refreshed_at || refreshed_at < time
       end
@@ -220,12 +226,12 @@ module Bones
       #
       # @return [ nil ] nil.
       #
-      # @since 1.0.0
+      # @since 0.0.1
       def refresh
-        if address.resolve(self)
+        if address.resolve(current_actor)
           begin
             @refreshed_at = Time.now
-            if synchronize.value(timeout)
+            if synchronize.value(refresh_timeout)
               cluster.handle_refresh(current_actor)
             else
               down
@@ -236,24 +242,28 @@ module Bones
         end
       end
 
-      def request(method, params)
-        with_future(Protocol::Request.new(next_request_id, method, params))
-      end
-
-      def synchronize
-        with_future(Protocol::Synchronize.new(next_synack_id, adapter))
-      end
-
       # Get the timeout, in seconds, for this node.
       #
       # @example Get the timeout in seconds.
-      #   node.timeout
+      #   node.refresh_timeout
       #
       # @return [ Integer ] The configured timeout or the default of 5.
       #
-      # @since 1.0.0
-      def timeout
-        @timeout ||= (options[:timeout] || 5)
+      # @since 0.0.1
+      def refresh_timeout
+        @refresh_timeout ||= (options[:timeout] || 5)
+      end
+
+      def registry_empty?
+        @registry.empty?
+      end
+
+      def request(method, params)
+        with_future(Protocol::Request.new(next_request_id, method, params))
+      end
+
+      def synchronize
+        with_future(Protocol::Synchronize.new(next_synack_id, adapter))
       end
 
       private
@@ -271,7 +281,7 @@ module Bones
       #
       # @return [ Object ] The result of the yield.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def logging(message)
         instrument(TOPIC, prefix: "  BONES-RPC: #{address.resolved}", ops: [message]) do
           yield if block_given?
@@ -297,7 +307,7 @@ module Bones
       def process(message, future = nil)
         logging(message) do
           ensure_connected do
-            @connection.write([[message, future]])
+            connection { |conn| conn.write([[message, future]]) }
           end
         end
         return future
@@ -306,7 +316,7 @@ module Bones
       end
 
       def with_future(message)
-        process(message, Future.new)
+        process(message, cluster.session.backend.future_class.new)
       end
 
       def without_future(message)

data/lib/bones/rpc/node/registry.rb

@@ -8,6 +8,10 @@ module Bones
           @registry = {}
         end
 
+        def empty?
+          @registry.empty? || @registry.all? { |channel, child| child.empty? }
+        end
+
         def flush(exception = Errors::ConnectionFailure.new("Socket closed"))
           return true if @registry.empty?
           @registry.each do |channel, futures|

data/lib/bones/rpc/parser.rb

@@ -31,29 +31,32 @@ module Bones
           if b.nil?
             raise EOFError
           elsif b.start_with?(EXT8)
+            pos = buffer.pos
             buffer.skip(1)
             len, = buffer.read(1).unpack('C')
             type, = buffer.read(1).unpack('C')
             check_ext!(type)
             head, = buffer.read(1).unpack('C')
             data = buffer.read(len-1)
-            parse_ext!(head, data)
+            parse_ext!(head, data, pos)
           elsif b.start_with?(EXT16)
+            pos = buffer.pos
             buffer.skip(1)
             len, = buffer.read(2).unpack('n')
             type, = buffer.read(1).unpack('C')
             check_ext!(type)
             head, = buffer.read(1).unpack('C')
             data = buffer.read(len-1)
-            parse_ext!(head, data)
+            parse_ext!(head, data, pos)
           elsif b.start_with?(EXT32)
+            pos = buffer.pos
             buffer.skip(1)
             len, = buffer.read(4).unpack('N')
             type, = buffer.read(1).unpack('C')
             check_ext!(type)
             head, = buffer.read(1).unpack('C')
             data = buffer.read(len-1)
-            parse_ext!(head, data)
+            parse_ext!(head, data, pos)
           else
             object = parser.read
             buffer.seek(parser.unpacker_pos)
@@ -88,12 +91,20 @@ module Bones
         end
       end
 
-      def parse_ext!(head, data)
+      def parse_ext!(head, data, pos)
         message = Protocol.get_by_ext_head(head)
         if message
           message.unpack(data)
         else
-          map_from!(Adapter.get_by_ext_head(head).unpack(data))
+          ext_adapter = Adapter.get_by_ext_head(head)
+          if ext_adapter == adapter
+            buffer.seek(pos)
+            object = parser.read
+            buffer.seek(parser.unpacker_pos)
+            map_from!(object)
+          else
+            raise(Errors::InvalidExtMessage, "bad ext adapter message received of type #{ext_adapter.inspect} (should be #{adapter.inspect})")
+          end
         end
       end
 

data/lib/bones/rpc/parser/buffer.rb

@@ -7,7 +7,11 @@ module Bones
         attr_reader :io
 
         def initialize(data)
-          @io = StringIO.new(data)
+          @io = data.is_a?(StringIO) ? data : StringIO.new(data)
+        end
+
+        def getbyte
+          io.getbyte
         end
 
         def getc
@@ -21,7 +25,7 @@ module Bones
         def read(n)
           i = pos
           data = io.read(n)
-          if data.bytesize < n
+          if data.nil? || data.bytesize < n
             seek(i)
             raise EOFError
           else

data/lib/bones/rpc/protocol/adapter_helper.rb

@@ -15,7 +15,7 @@ module Bones
         #
         # @return [ nil ] nil.
         #
-        # @since 1.0.0
+        # @since 0.0.1
         def receive_replies(connection); end
 
         # Serializes the message and all of its fields to a new buffer or to the
@@ -28,7 +28,7 @@ module Bones
         #
         # @return [ String ] The result of serliazing this message
         #
-        # @since 1.0.0
+        # @since 0.0.1
         def serialize(buffer, adapter)
           Adapter.get(adapter).serialize(process, buffer)
         end

data/lib/bones/rpc/protocol/binary_helper.rb

@@ -39,7 +39,7 @@ module Bones
         #
         # @return [ nil ] nil.
         #
-        # @since 1.0.0
+        # @since 0.0.1
         def receive_replies(connection); end
 
         # Serializes the message and all of its fields to a new buffer or to the
@@ -52,7 +52,7 @@ module Bones
         #
         # @return [ String ] The result of serliazing this message
         #
-        # @since 1.0.0
+        # @since 0.0.1
         def serialize(buffer = "", adapter = nil)
           raise NotImplementedError, "This method is generated after calling #finalize on a message class"
         end

data/lib/bones/rpc/read_preference.rb

@@ -7,14 +7,14 @@ module Bones
 
     # Provides behaviour around getting various read preference implementations.
     #
-    # @since 2.0.0
+    # @since 0.0.1
     module ReadPreference
       extend self
 
       # Hash lookup for the read preference classes based off the symbols
       # provided in configuration.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       PREFERENCES = {
         nearest: Nearest
       }.freeze
@@ -34,7 +34,7 @@ module Bones
       #
       # @return [ Object ] The appropriate read preference.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       def get(name, tags = nil)
         PREFERENCES.fetch(name.to_sym).new(tags)
       end

data/lib/bones/rpc/read_preference/nearest.rb

@@ -5,7 +5,7 @@ module Bones
 
       # Encapsulates behaviour around a nearest read preference.
       #
-      # @since 2.0.0
+      # @since 0.0.1
       class Nearest
         include Selectable
 
@@ -16,7 +16,7 @@ module Bones
         #
         # @return [ Symbol ] :nearest.
         #
-        # @since 2.0.0
+        # @since 0.0.1
         def name
           :nearest
         end
@@ -40,7 +40,7 @@ module Bones
         #
         # @return [ Object ] The result of the block.
         #
-        # @since 2.0.0
+        # @since 0.0.1
         def with_node(cluster, &block)
           with_retry(cluster) do
             nearest = cluster.nodes.sort_by(&:latency).first