devp2p 0.2.0 → 0.3.0

data/lib/devp2p/{base_protocol.rb → protocol.rb}

@@ -20,9 +20,8 @@ module DEVp2p
   # The default implementation of `command.receive` calls callbacks which can
   # be registered in a list which is available as: `protocol.receive_X_callbacks`.
   #
-  class BaseProtocol
-    include Celluloid
-    include Control
+  class Protocol
+    include Concurrent::Async
 
     extend Configurable
     add_config(
@@ -41,28 +40,31 @@ module DEVp2p
       @peer = peer
       @service = service
 
-      initialize_control
+      @stopped = false
 
       setup
     end
 
     def start
-      logger.debug 'starting', proto: Actor.current
-      service.on_wire_protocol_start Actor.current
-      super
+      logger.debug 'starting', proto: self
+      service.async.on_wire_protocol_start self
+    rescue
+      puts $!
+      puts $!.backtrace[0,10].join("\n")
     end
 
     def stop
-      logger.debug 'stopping', proto: Actor.current
-      service.on_wire_protocol_stop Actor.current
+      logger.debug 'stopping', proto: self
+      service.async.on_wire_protocol_stop self
 
-      super
-
-      terminate
+      @stopped = true
+    rescue
+      puts $!
+      puts $!.backtrace[0,10].join("\n")
     end
 
-    def _run
-      # pass
+    def stopped?
+      @stopped
     end
 
     def receive_packet(packet)
@@ -75,7 +77,7 @@ module DEVp2p
     end
 
     def send_packet(packet)
-      peer.send_packet packet
+      peer.async.send_packet packet
     end
 
     def to_s
@@ -98,14 +100,14 @@ module DEVp2p
 
       raise DuplicatedCommand unless klasses.map(&:cmd_id).uniq.size == klasses.size
 
-      proto = Actor.current
+      proto = self
 
       klasses.each do |klass|
         instance = klass.new
 
         # decode rlp, create hash, call receive
         receive = lambda do |packet|
-          raise ArgumentError unless packet.is_a?(Packet)
+          raise ArgumentError, "packet is not a Packet: #{packet.inspect}" unless packet.is_a?(Packet)
           instance.receive proto, klass.decode_payload(packet.payload)
         end
 

data/lib/devp2p/service.rb

@@ -0,0 +1,50 @@
+# -*- encoding : ascii-8bit -*-
+
+module DEVp2p
+
+  class Service
+    include Concurrent::Async
+
+    extend Configurable
+    add_config(
+      name: '',
+      default_config: {},
+      required_services: []
+    )
+
+    class <<self
+      def register_with_app(app)
+        app.register_service self, app
+      end
+    end
+
+    attr :app, :config
+
+    def initialize(app)
+      super()
+
+      @app = app
+      @config = app.config.reverse_merge(default_config)
+
+      available_services = app.services.each_value.map(&:class)
+      required_services.each do |r|
+        raise MissingRequiredServiceError, "require service #{r}" unless available_services.include?(r)
+      end
+    end
+
+    def start
+      raise NotImplemented
+    end
+
+    def stop
+      raise NotImplemented
+    end
+
+    def to_s
+      "<Service #{name}##{object_id}>"
+    end
+    alias inspect to_s
+
+  end
+
+end

data/lib/devp2p/sync_queue.rb

@@ -1,8 +1,7 @@
 # -*- encoding : ascii-8bit -*-
 
-##
-# A naive synchronized queue for Celluloid actors.
-#
+require 'thread'
+
 class SyncQueue
 
   attr :queue, :max_size
@@ -12,69 +11,83 @@ class SyncQueue
     @num_waiting = 0
 
     @max_size = max_size
-    @cond_full = Celluloid::Condition.new
-    @cond_empty = Celluloid::Condition.new
+
+    @mutex = Mutex.new
+    @cond_full = ConditionVariable.new
+    @cond_empty = ConditionVariable.new
   end
 
   def enq(obj, non_block=false)
-    loop do
-      if full?
-        if non_block
-          raise ThreadError, 'queue full'
-        else
-          begin
-            @num_waiting += 1
-            @cond_full.wait
-          ensure
-            @num_waiting -= 1
+    Thread.handle_interrupt(StandardError => :on_blocking) do
+      loop do
+        @mutex.synchronize do
+          if full?
+            if non_block
+              raise ThreadError, 'queue full'
+            else
+              begin
+                @num_waiting += 1
+                @cond_full.wait @mutex
+              ensure
+                @num_waiting -= 1
+              end
+            end
+          else
+            @queue.push obj
+            @cond_empty.signal
+            return obj
           end
         end
-      else
-        @queue.push obj
-        @cond_empty.signal
-        return obj
       end
     end
   end
   alias << enq
 
   def deq(non_block=false)
-    loop do
-      if empty?
-        if non_block
-          raise ThreadError, 'queue empty'
-        else
-          begin
-            @num_waiting += 1
-            @cond_empty.wait
-          ensure
-            @num_waiting -= 1
+    Thread.handle_interrupt(StandardError => :on_blocking) do
+      loop do
+        @mutex.synchronize do
+          if empty?
+            if non_block
+              raise ThreadError, 'queue empty'
+            else
+              begin
+                @num_waiting += 1
+                @cond_empty.wait @mutex
+              ensure
+                @num_waiting -= 1
+              end
+            end
+          else
+            obj = @queue.shift
+            @cond_full.signal
+            return obj
           end
         end
-      else
-        obj = @queue.shift
-        @cond_full.signal
-        return obj
       end
     end
   end
 
   # Same as pop except it will not remove the element from queue, just peek.
   def peek(non_block=false)
-    loop do
-      if empty?
-        if non_block
-          raise ThreadError, 'queue empty'
-        else
-          begin
-            @num_waiting += 1
-            @cond_empty.wait
-          ensure
-            @num_waiting -= 1
+    Thread.handle_interrupt(StandardError => :on_blocking) do
+      loop do
+        @mutex.synchronize do
+          if empty?
+            if non_block
+              raise ThreadError, 'queue empty'
+            else
+              begin
+                @num_waiting += 1
+                @cond_empty.wait @mutex
+              ensure
+                @num_waiting -= 1
+              end
+            end
+          else
+            return @queue[0]
           end
         end
-      else
-        return @queue[0]
       end
     end
   end

data/lib/devp2p/version.rb

@@ -1,6 +1,7 @@
 # -*- encoding : ascii-8bit -*-
+
 module DEVp2p
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   VersionString = begin
                     git_describe_re = /^(?<version>v\d+\.\d+\.\d+)-(?<git>\d+-g[a-fA-F0-9]+(?:-dirty)?)$/

data/lib/devp2p/wired_service.rb

@@ -12,17 +12,17 @@ module DEVp2p
   #         with instances of Peer and WiredService
   #       WiredService.wire_protocol(Peer.new, WiredService.new)
   #
-  class WiredService < BaseService
+  class WiredService < Service
     name 'wired'
 
     attr_accessor :wire_protocol
 
     def on_wire_protocol_start(proto)
-      raise ArgumentError, "argument is not a protocol" unless proto.is_a?(BaseProtocol)
+      raise ArgumentError, "argument is not a protocol" unless proto.is_a?(::DEVp2p::Protocol)
     end
 
     def on_wire_protocol_stop(proto)
-      raise ArgumentError, "argument is not a protocol" unless proto.is_a?(BaseProtocol)
+      raise ArgumentError, "argument is not a protocol" unless proto.is_a?(::DEVp2p::Protocol)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devp2p
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jan Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -38,34 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: celluloid-io
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: digest-sha3
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +148,10 @@ files:
 - LICENSE
 - README.md
 - lib/devp2p.rb
-- lib/devp2p/app_helper.rb
-- lib/devp2p/base_app.rb
-- lib/devp2p/base_protocol.rb
-- lib/devp2p/base_service.rb
+- lib/devp2p/app.rb
 - lib/devp2p/command.rb
 - lib/devp2p/configurable.rb
 - lib/devp2p/connection_monitor.rb
-- lib/devp2p/control.rb
 - lib/devp2p/crypto.rb
 - lib/devp2p/crypto/ecc_x.rb
 - lib/devp2p/crypto/ecies.rb
@@ -194,7 +176,9 @@ files:
 - lib/devp2p/peer.rb
 - lib/devp2p/peer_errors.rb
 - lib/devp2p/peer_manager.rb
+- lib/devp2p/protocol.rb
 - lib/devp2p/rlpx_session.rb
+- lib/devp2p/service.rb
 - lib/devp2p/sync_queue.rb
 - lib/devp2p/utils.rb
 - lib/devp2p/version.rb

data/lib/devp2p/app_helper.rb

@@ -1,85 +0,0 @@
-# -*- encoding : ascii-8bit -*-
-
-module DEVp2p
-  class AppHelper
-
-    def run(app_class, service_class, num_nodes: 3, seed: 0, min_peers: 2, max_peers: 2, random_port: false)
-      base_port = random_port ? SecureRandom.random_number(50000) + 10000 : 29870
-
-      bootstrap_node_privkey = Crypto.mk_privkey "#{seed}:udp:0"
-      bootstrap_node_pubkey = Crypto.privtopub bootstrap_node_privkey
-      enode = Utils.host_port_pubkey_to_uri "0.0.0.0", base_port, bootstrap_node_pubkey
-
-      services = [Discovery::Service, PeerManager]#, service_class]
-
-      base_config = {}
-      services.each {|s| Utils.update_config_with_defaults base_config, s.default_config }
-
-      base_config[:discovery][:bootstrap_nodes] = [enode]
-      base_config[:seed] = seed
-      base_config[:base_port] = base_port
-      base_config[:num_nodes] = num_nodes
-      base_config[:min_peers] = min_peers
-      base_config[:max_peers] = max_peers
-
-      apps = []
-      num_nodes.times do |node_num|
-        app = create_app node_num, base_config, services, app_class
-        apps.push app
-      end
-
-      serve_until_stopped apps
-    end
-
-    def create_app(node_num, config, services, app_class)
-      num_nodes = config[:num_nodes]
-      base_port = config[:base_port]
-      seed = config[:seed]
-      min_peers = config[:min_peers]
-      max_peers = config[:max_peers]
-
-      raise "invalid node_num" unless node_num < num_nodes
-      #raise "invalid min/max peers" unless min_peers <= max_peers && max_peers < num_nodes
-
-      config = Marshal.load Marshal.dump(config)
-      config[:node_num] = node_num
-
-      config[:node][:privkey_hex] = Utils.encode_hex Crypto.mk_privkey("#{seed}:udp:#{node_num}")
-      config[:discovery][:listen_port] = base_port + node_num
-      config[:p2p][:listen_port] = base_port + node_num
-      config[:p2p][:min_peers] = [min_peers, 10].min
-      config[:p2p][:max_peers] = max_peers
-      config[:client_version_string] = "NODE#{node_num}"
-
-      app = app_class.new config
-
-      services.each do |service|
-        raise "invalid service" unless service.instance_of?(Class) && service < BaseService
-
-        if !app.config[:deactivated_services].include?(service.name)
-          raise "service should not be active" if app.services.has_key?(service.name)
-          service.register_with_app app
-          raise "servier should be active" unless app.services.has_key?(service.name)
-        end
-      end
-
-      app
-    end
-
-    def serve_until_stopped(apps)
-      apps.each do |app|
-        app.start
-
-        if app.config[:post_app_start_callback]
-          app.config[:post_app_start_callback].call(app)
-        end
-      end
-
-      apps.each(&:join)
-
-      # finally stop
-      apps.each(&:stop)
-    end
-
-  end
-end