em-nodes 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b47ba8138b82b37389094a0e941603e8b1c4128
-  data.tar.gz: 2044009a60a4947aa14a752f7ecf4a41613e1ec7
+  metadata.gz: ddccb975cd4137ced9c16858feba42614f81bcf5
+  data.tar.gz: 2e61ef3174a99ea5b024d4debf8fc31011a2c475
 SHA512:
-  metadata.gz: 39e256163916d4d2ef972524e2a7789498b16349063aefa8ce5b42226fc167fd7e36ff873a177bff39f55c04fedbb3a1441c960646285ddc2fbbcd46b4015ebf
-  data.tar.gz: 94abef2e1f64b5a7d9269d6811b671a1ad422567b6d2af54ac938796b4a1717a43c804c28517f115ab885153b2a389689c85945103fba5fe2835a8e2aaa1cd0d
+  metadata.gz: 09ae7052192a4bdfc4726dc810db41ba2f97c5d710652fdd7b6bf8fb33719d4d5386a607238a726fc3d3c4fb17270f48bab3509a3148e36e0f81084615349a22
+  data.tar.gz: 427c10dae0acd687425c51c49d5a9f749ef55b74cc7b2a700444caf1d90aa42bfcf27bccef1054027b03468bd5e51bcd5562734dfa0d30cb19bcb2f2fcfcef7a

data/.rspec

@@ -0,0 +1 @@
+--color

data/benchmark/client.rb

@@ -0,0 +1,27 @@
+require 'rubygems'
+require "bundler/setup"
+Bundler.require
+
+class Client < EM::Nodes::Client
+  include HelloFeature
+  include TaskFeature
+
+  def info
+    { :name => "client" }
+  end
+
+  def on_task(task_id, data)
+    send_task_result(task_id, data + 1)
+  end
+
+  def unbind
+    super
+    EM.stop
+  end
+end
+
+EM.run do
+  puts "client run"
+  Client.connect '/tmp/test_em_nodes_sock'
+end
+

data/benchmark/run.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+ruby server.rb &
+sleep 0.4
+ruby client.rb &
+ruby client.rb &
+ruby client.rb &
+ruby client.rb &
+ruby client.rb &

data/benchmark/server.rb

@@ -0,0 +1,44 @@
+require 'rubygems'
+require "bundler/setup"
+Bundler.require
+
+CLIENTS_COUNT = 5
+TASKS_COUNT = 100000
+
+class Server < EM::Nodes::Server
+  include HelloFeature
+  include TaskFeature
+
+  def on_task_result(res)
+    $res_count += 1
+    $res += res
+
+    if $res_count >= TASKS_COUNT
+      EM.next_tick { EM.stop }
+    else
+      send_task(res + 1)
+    end
+  end
+end
+
+$res = 0
+$res_count = 0
+
+tm = Time.now
+
+EM.run do
+  Server.start '/tmp/test_em_nodes_sock'
+
+  tm = Time.now
+  Thread.new do
+    sleep 0.5 while Server.ready_clients.size < CLIENTS_COUNT
+    tm = Time.now
+
+    Server.ready_clients.each do |client|
+      client.send_task(0)
+    end
+  end
+
+end
+
+puts "executed with #{Time.now - tm}, res: #{$res}, res_count: #{$res_count}"

data/examples/chat_client.rb

@@ -8,11 +8,11 @@ class ChatClient < EM::Nodes::Client
     super
   end
 
-  def who_are_you?
-    server.send_i_am @name
+  def on_who_are_you?
+    send_i_am @name
   end
 
-  def say(msg)
+  def on_say(msg)
     puts msg
   end
 
@@ -23,7 +23,7 @@ class ChatClient < EM::Nodes::Client
 end
 
 def say(msg)
-  $cl.server.send_say(msg)
+  $cl.send_say(msg)
 end
 
 EM.run do

data/examples/chat_server.rb

@@ -4,16 +4,16 @@ Bundler.require
 class ChatServer < EM::Nodes::Server
   def post_init
     super
-    client.send_who_are_you?
+    send_who_are_you?
   end
 
-  def i_am(name)
-    client.data.name = name
+  def on_i_am(name)
+    self.data.name = name
     to_all "> coming #{name} <"
   end
 
-  def say(msg)
-    to_all "#{client.data.name} say: #{msg}"
+  def on_say(msg)
+    to_all "#{data.name} say: #{msg}"
   end
 
   def to_all(msg)
@@ -22,7 +22,7 @@ class ChatServer < EM::Nodes::Server
 
   def unbind
     super
-    to_all("quiting #{client.data.name}")
+    to_all("quiting #{data.name}")
   end
 end
 

data/lib/em-nodes/client/hello.rb

@@ -0,0 +1,21 @@
+class EM::Nodes::Client
+  module HelloFeature
+
+    def on_who_are_you?
+      i = info
+      raise "info should be a Hash, but not #{i.inspect}" unless i.is_a?(Hash)
+      send_i_am(i.merge(__default_info__))
+    end
+
+    def info
+      {} # redefine me
+    end
+
+  private
+
+    def __default_info__
+      { :hostname => (`hostname` rescue "").chop }
+    end
+
+  end
+end

data/lib/em-nodes/client/task.rb

@@ -0,0 +1,18 @@
+class EM::Nodes::Client
+  module TaskFeature
+
+    def on_task(task_id, data)
+      # redefine me
+    end
+
+  private
+
+    def on_task_internal(task_id, data)
+      on_task(task_id, data)
+    end
+
+    def send_task_result(task_id, result)
+      send_task_result_internal(task_id, result)
+    end
+  end
+end

data/lib/em-nodes/client.rb

@@ -1,22 +1,23 @@
 class EM::Nodes::Client < EM::Connection
-  autoload :Server, 'em-nodes/client/server'
-
-  attr_reader :server
+  autoload :HelloFeature,  'em-nodes/client/hello'
+  autoload :TaskFeature,   'em-nodes/client/task'
 
   include EM::P::ObjectProtocol
   include EM::Nodes::Commands
 
+  attr_reader :alive
+
   def post_init
-    @server = EM::Nodes::Client::Server.new(self)
-    EM::Nodes.logger.debug "Connected to server"
+    @alive = true
+    EM::Nodes.logger.info { "Connected to server" }
   end
 
   def unbind
-    @server.disconnect!
-    EM::Nodes.logger.warn "connection has terminated"
+    @alive = false
+    EM::Nodes.logger.warn { "Connection has terminated" }
   end
 
-  def self.connect(host, port, *args, &block)
+  def self.connect(host, port = nil, *args, &block)
     EM.connect(host, port, self, *args)
   end
 end

data/lib/em-nodes/commands.rb

@@ -1,23 +1,37 @@
 module EM::Nodes::Commands
-  def receive_object(h)
-    unless h.is_a?(Hash)
-      EM::Nodes.logger.error "received unknown object: #{obj.inspect}"
-      return
-    end
 
-    method = h[:method]
-    args = h[:args]
-    EM::Nodes.logger.debug "<= #{method} #{args}"
+  def receive_object(h)
+    method, args = h
+    method = 'on_' + method
     t = Time.now
     send(method, *args)
-    EM::Nodes.logger.info "<= #{method} #{args} (#{Time.now - t}s)"
+    EM::Nodes.logger.debug { "<= #{method} #{args.inspect} (#{Time.now - t}s)" }
+
   rescue Object => ex
     EM::Nodes.exception(ex)
   end
 
   def send_command(method, args)
-    obj = {:method => method, :args => args}
-    EM::Nodes.logger.debug "=> #{method}"
-    EM.schedule { send_object(obj) }
+    EM::Nodes.logger.debug { "=> #{method}" }
+    EM.schedule { send_object [method.to_s, args] }
+  end
+
+  COMMAND_PREFIX = 'send_'
+
+  def method_missing(method, *args)
+    method = method.to_s
+
+    unless method.start_with?(COMMAND_PREFIX)
+      EM::Nodes.logger.warn { "unknown send :#{method} #{args.inspect}" }
+      super(method, *args)
+      return
+    end
+
+    if @alive
+      send_command(method[5..-1], args)
+    else
+      EM::Nodes.logger.error { "failed command attempt #{method}, connection dead" }
+    end
   end
+
 end

data/lib/em-nodes/server/hello.rb

@@ -0,0 +1,27 @@
+class EM::Nodes::Server
+  module HelloFeature
+    def self.included(base)
+      base.send :extend, ClassMethods
+    end
+
+    module ClassMethods
+      def ready_clients
+        clients.select{ |cl| cl.data.ready }
+      end
+    end
+
+    def post_init
+      super
+      send_who_are_you?
+    end
+
+    def on_i_am(params)
+      params.each do |key, value|
+        self.data.send "#{key}=", value
+      end
+
+      self.data.ready = true
+      EM::Nodes.logger.info { "Hello client #{self.data.inspect}" }
+    end
+  end
+end

data/lib/em-nodes/server/task.rb

@@ -0,0 +1,56 @@
+require 'thread'
+
+class EM::Nodes::Server
+  module TaskFeature
+    def initialize(*args)
+      super(*args)
+      @mutex = Mutex.new
+      @tasks = {}
+      @task_inc = 0
+    end
+
+    def task_count
+      @mutex.synchronize { @tasks.size }
+    end
+
+    def send_task(data)
+      task_id = next_task_id
+      add_task(task_id, data)
+      send_task_internal(task_id, data)
+    end
+
+    def on_task_result(res)
+      # redefine me
+    end
+
+    def on_reschedule_tasks(values)
+      # redefine me
+    end
+
+    def unbind
+      super
+      on_reschedule_tasks(@tasks.values)
+      @mutex.synchronize { @tasks.clear }
+    end
+
+  private
+
+    def on_task_result_internal(task_id, res)
+      del_task(task_id)
+      on_task_result(res)
+    end
+
+    def add_task(task_id, data)
+      @mutex.synchronize { @tasks[task_id] = data }
+    end
+
+    def del_task(task_id)
+      @mutex.synchronize { @tasks.delete(task_id) }
+    end
+
+    def next_task_id
+      @mutex.synchronize { @task_inc += 1 }
+    end
+
+  end
+end

data/lib/em-nodes/server.rb

@@ -1,13 +1,15 @@
 require 'socket'
+require 'ostruct'
 
 class EM::Nodes::Server < EM::Connection
-  autoload :Client, 'em-nodes/server/client'
-
-  attr_reader :client
+  autoload :HelloFeature,  'em-nodes/server/hello'
+  autoload :TaskFeature,   'em-nodes/server/task'
 
   include EM::P::ObjectProtocol
   include EM::Nodes::Commands
 
+  attr_reader :alive
+
   class << self
     def clients
       @clients ||= []
@@ -18,6 +20,8 @@ class EM::Nodes::Server < EM::Connection
     end
   end
 
+  attr_reader :data
+
   def accept?(host, port)
     true
   end
@@ -27,27 +31,32 @@ class EM::Nodes::Server < EM::Connection
   end
 
   def post_init
-    self.comm_inactivity_timeout = inactivity_timeout
+    @data = OpenStruct.new
 
-    port, host = Socket.unpack_sockaddr_in(get_peername)
+    self.comm_inactivity_timeout = inactivity_timeout if EM.reactor_running?
+
+    port, host = Socket.unpack_sockaddr_in(get_peername) rescue []
     unless accept?(host, port)
       unbind
       return
     end
+    self.data.host = host
+    self.data.port = port
 
-    @client = EM::Nodes::Server::Client.new(self)
-    self.class.clients << @client
-    EM::Nodes.logger.info "Incomming connection from #{host}:#{port}"
+    @alive = true
+    self.class.clients << self
+    EM::Nodes.logger.info { "Incomming connection from #{host}:#{port}" }
   end
 
   def unbind
-    @client.disconnect!
-    self.class.clients.delete @client
-    EM::Nodes.logger.info "Client has disconnected"
+    @alive = false
+    self.class.clients.delete self
+    EM::Nodes.logger.info { "Client #{self.data.inspect} has disconnected" }
   end
 
-  def self.start(host, port, *args)
-    EM::Nodes.logger.info "start server on #{host}:#{port}"
+  def self.start(host, port = nil, *args)
+    EM::Nodes.logger.info { "Start server #{host}:#{port}" }
     EM.start_server host, port, self, *args
   end
 end
+

data/lib/em-nodes.rb

@@ -2,7 +2,7 @@ require 'eventmachine'
 require 'logger'
 
 module EM::Nodes
-  VERSION = "0.1"
+  VERSION = "0.2"
 
   class << self
     def logger=(logger)

data/spec/base_spec.rb

@@ -0,0 +1,56 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class Client0 < EM::Nodes::Client
+  attr_reader :bla
+
+  def post_init
+    super
+    @bla = 1
+  end
+
+  def unbind
+    super
+    @bla = 2
+  end
+end
+
+class Server0 < EM::Nodes::Server
+  attr_reader :bla
+
+  def post_init
+    super
+    @bla = 1
+  end
+
+  def unbind
+    super
+    @bla = 2
+  end
+end
+
+describe "Base spec" do
+  it "base callbacks should work" do
+    EM.run do
+      $server0 = Server0.start('/tmp/_emn_server0')
+      $client0 = Client0.connect('/tmp/_emn_server0')
+
+      EM.next_tick do
+        $client0.bla.should == 1
+        $client0.alive.should == true
+
+        $client00 = Server0.clients.first
+        $client00.bla.should == 1
+        $client00.alive.should == true
+      end
+
+      EM.add_timer(0.2) { EM.next_tick { EM.stop } }
+    end
+
+    $client0.bla.should == 2
+    $client0.alive.should == false
+
+    Server0.clients.size.should == 0
+    $client00.bla.should == 2
+    $client00.alive.should == false
+  end
+end

data/spec/hello_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+class Client3 < EM::Nodes::Client
+  include HelloFeature
+
+  def info
+    { :name => "vasya" }
+  end
+end
+
+class Server3 < EM::Nodes::Server
+  include HelloFeature
+
+  def on_i_am(params)
+    super
+    $client3_result = self.data
+    $server3_ready_clients = Server3.ready_clients
+    EM.stop
+  end
+end
+
+describe "Hello spec" do
+  it "should work" do
+    EM.run do
+      $server3 = Server3.start('127.0.0.1', 19994)
+      $client3 = Client3.connect('127.0.0.1', 19994)
+    end
+
+    $client3_result.name.should == 'vasya'
+    $server3_ready_clients.size.should == 1
+  end
+end

data/spec/simple2_spec.rb

@@ -3,15 +3,15 @@ require File.dirname(__FILE__) + '/spec_helper'
 $pong = []
 
 class Client2 < EM::Nodes::Client
-  def pong(a)
+  def on_pong(a)
     $pong << a
     EM.stop if $pong.size >= 2
   end
 end
 
 class Server2 < EM::Nodes::Server
-  def ping(a)
-    client.send_pong(a)
+  def on_ping(a)
+    send_pong(a + 1)
   end
 end
 
@@ -22,10 +22,10 @@ describe "Simple spec" do
       $client21 = Client2.connect('127.0.0.1', 19993)
       $client22 = Client2.connect('127.0.0.1', 19993)
 
-      $client21.server.send_ping(1)
-      $client22.server.send_ping(2)
+      $client21.send_ping(1)
+      $client22.send_ping(2)
     end
 
-    $pong.should == [1, 2]
+    $pong.should == [2, 3]
   end
 end

data/spec/simple_spec.rb

@@ -3,11 +3,11 @@ require File.dirname(__FILE__) + '/spec_helper'
 class Client1 < EM::Nodes::Client
   def initialize(name)
     @name = name
-    super
+    super()
   end
 
-  def who_are_you?
-    server.send_i_am @name
+  def on_who_are_you?
+    send_i_am @name
   end
 
   def unbind
@@ -19,13 +19,13 @@ end
 class Server1 < EM::Nodes::Server
   def post_init
     super
-    client.send_who_are_you?
+    send_who_are_you?
   end
 
-  def i_am(name)
-    client.data.name = name
+  def on_i_am(name)
+    self.data.name = name
     $client1_result = { :name => name, :clients => Server1.clients.clone }
-    client.send_unbind
+    EM.stop
   end
 end
 

data/spec/task_spec.rb

@@ -0,0 +1,64 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+
+class Client4 < EM::Nodes::Client
+  include TaskFeature
+
+  def on_task(task_id, data)
+    $client4_results << data
+    send_task_result(task_id, data + 1)  if $client4_results.size <= 10
+  end
+end
+
+class Server4 < EM::Nodes::Server
+  include TaskFeature
+
+  def on_task_result(res)
+    $server4_results << res
+    EM.next_tick { EM.stop } if $server4_results.size >= 10
+  end
+
+  def on_reschedule_tasks(values)
+    $server4_unbind_results = values
+  end
+end
+
+describe "Task spec" do
+  before {
+    $client4_results = []
+    $server4_results = []
+    $server4_unbind_results = []
+  }
+
+  it "should work" do
+    client4 = nil
+    EM.run do
+      $server4 = Server4.start('127.0.0.1', 19995)
+      $client4 = Client4.connect('127.0.0.1', 19995)
+
+      EM.next_tick do
+        client4 = Server4.clients.first
+        10.times { |i| client4.send_task(i) }
+      end
+    end
+
+    $server4_results.should == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+    $server4_unbind_results.should == []
+    client4.task_count.should == 0
+  end
+
+  it "on unbind" do
+    EM.run do
+      $server4 = Server4.start('127.0.0.1', 19996)
+      $client4 = Client4.connect('127.0.0.1', 19996)
+
+      EM.next_tick do
+        client4 = Server4.clients.first
+        20.times { |i| client4.send_task(i) }
+      end
+    end
+
+    $server4_results.should == [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+    $server4_unbind_results.sort.should == [10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-nodes
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - '''Konstantin Makarchev'''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -74,23 +74,31 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- benchmark/client.rb
+- benchmark/run.sh
+- benchmark/server.rb
 - em-nodes.gemspec
 - examples/chat_client.rb
 - examples/chat_server.rb
 - lib/em-nodes.rb
-- lib/em-nodes/abstract_command.rb
 - lib/em-nodes/client.rb
-- lib/em-nodes/client/server.rb
+- lib/em-nodes/client/hello.rb
+- lib/em-nodes/client/task.rb
 - lib/em-nodes/commands.rb
 - lib/em-nodes/server.rb
-- lib/em-nodes/server/client.rb
+- lib/em-nodes/server/hello.rb
+- lib/em-nodes/server/task.rb
+- spec/base_spec.rb
+- spec/hello_spec.rb
 - spec/simple2_spec.rb
 - spec/simple_spec.rb
 - spec/spec_helper.rb
+- spec/task_spec.rb
 homepage: https://github.com/kostya/em-nodes
 licenses:
 - MIT
@@ -116,6 +124,9 @@ signing_key:
 specification_version: 4
 summary: Simple EM client server, and some stuffs
 test_files:
+- spec/base_spec.rb
+- spec/hello_spec.rb
 - spec/simple2_spec.rb
 - spec/simple_spec.rb
 - spec/spec_helper.rb
+- spec/task_spec.rb

data/lib/em-nodes/abstract_command.rb

@@ -1,19 +0,0 @@
-module EM::Nodes::AbstractCommand
-  COMMAND_PREFIX = 'send_'
-
-  def method_missing(method, *args)
-    method = method.to_s
-
-    unless method.start_with?(COMMAND_PREFIX)
-      EM::Nodes.logger.debug "unknown send #{method} #{args.inspect}"
-      super
-      return
-    end
-
-    if @alive
-      @connection.send_command(method.sub(COMMAND_PREFIX, ''), args)
-    else
-      EM::Nodes.logger.error "failed command attempt #{method}, connection dead"
-    end
-  end
-end

data/lib/em-nodes/client/server.rb

@@ -1,13 +0,0 @@
-class EM::Nodes::Client::Server
-  include EM::Nodes::AbstractCommand
-
-  attr_accessor :connection, :alive
-  def initialize(conn)
-    @connection = conn
-    @alive = true
-  end
-
-  def disconnect!
-    @alive = false
-  end
-end

data/lib/em-nodes/server/client.rb

@@ -1,18 +0,0 @@
-require 'ostruct'
-
-class EM::Nodes::Server::Client
-  include EM::Nodes::AbstractCommand
-
-  attr_accessor :connection, :alive
-  attr_reader :data
-
-  def initialize(conn)
-    @connection = conn
-    @alive = true
-    @data = OpenStruct.new
-  end
-
-  def disconnect!
-    @alive = false
-  end
-end