ciri-p2p 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84a78196ee2a9a850e3f893c8f3f7a4a30eae83eb9cde69537020215723b9a8e
-  data.tar.gz: '09e75872015ea1b557150db5650f4ef2ccd7bcd180b6fbfa2caa78eae705a769'
+  metadata.gz: 812787a199fb23a823439aa870a3c80c33f8acc6522b2e3bb5cc7f5993bf8afa
+  data.tar.gz: 945d1e1e5cde2adc55e3d6cd9e3c7ad214712325499417e222fb520bd644d1e1
 SHA512:
-  metadata.gz: adb6135d935ee3ec9e4aa77c65a0aa44d741481acc44b30d6c880f6a9e35732243fdb9e318fee7a99efaab4d3370c3bfdb31d1a9d3bd2a2729e74a501f3b1b4a
-  data.tar.gz: ce7fcafe49551d9a0cbb9d62496395524d21507053f48add1f9d06101ee123930e2d09d6c082b0c671f3edeb46fe4fd37832513b6c9198fb45e15ff760ecee05
+  metadata.gz: 9b5011a0fb16a3c1937a60b8f7cc7e5a9665ab33b425333dc1c0334eb2ac8b895f4151ffc6682918952440412e3ce7fba9975aaa4675d3b23d9b43f6529afc5b
+  data.tar.gz: 3900551a9e53ecc7504f99c535201ba1431072d36bb383212959f14e6b8f9bbb68ff8126b8c19e4a872054af2d4e8a7f7837e468776d995215028bacd7bde1b5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ciri-p2p (0.2.0)
+    ciri-p2p (0.3.0)
       async (~> 1.10.3)
       async-io (~> 1.15.5)
       ciri-common (~> 0.1.0)

data/lib/ciri/p2p/discovery/service.rb

@@ -94,7 +94,7 @@ module Ciri
               @udp_port = @local_address.ip_port
             end
 
-            debug "start discovery server on udp_port: #{@udp_port} tcp_port: #{@tcp_port}\nlocal_node_id: #{@local_node_id}"
+            info "start discovery server on udp_port: #{@udp_port} tcp_port: #{@tcp_port}\nlocal_node_id: #{@local_node_id}"
 
             loop do
               # read discovery message

data/lib/ciri/p2p/network_state.rb

@@ -53,7 +53,7 @@ module Ciri
       def initialize_protocols(task: Async::Task.current)
         # initialize protocols
         @protocols.each do |protocol|
-          context = ProtocolContext.new(self)
+          context = ProtocolContext.new(self, protocol: protocol)
           task.async {protocol.initialized(context)}
         end
       end
@@ -75,7 +75,7 @@ module Ciri
           # check peers
           protocol_handshake_checks(handshake)
           @peers[peer.raw_node_id] = peer
-          debug "[#{local_node_id.short_hex}] connect to new peer #{peer.inspect}"
+          info "[#{local_node_id.short_hex}] connect to new peer #{peer.inspect}"
           @peer_store.update_peer_status(peer.raw_node_id, PeerStore::Status::CONNECTED)
           # run peer logic
           task.async do
@@ -89,7 +89,7 @@ module Ciri
         @peers_lock.acquire do
           # only disconnect from peers if direction correct to avoiding delete peer by mistake
           if (exist_peer = @peers[peer.raw_node_id]) && exist_peer.direction == peer.direction
-            debug("[#{local_node_id.short_hex}] disconnect peer: #{peer.inspect}, reason: #{reason}")
+            info("[#{local_node_id.short_hex}] disconnect peer: #{peer.inspect}, reason: #{reason}")
             remove_peer(peer)
             peer.disconnect
             @peer_store.update_peer_status(peer.raw_node_id, PeerStore::Status::DISCONNECTED)
@@ -166,7 +166,8 @@ module Ciri
             handle_message(peer, msg)
           end
         rescue StandardError => e
-          disconnect_peer(peer, reason: "io error: #{e}\n#{e.backtrace.join "\n"}")
+          disconnect_peer(peer, reason: "io error: #{e}")
+          error("io error: #{e}\n#{e.backtrace.join "\n"}")
         end
 
         message_service.wait

data/lib/ciri/p2p/protocol_context.rb

@@ -34,7 +34,6 @@ module Ciri
 
       attr_reader :peer, :protocol, :protocol_io
 
-      def_delegators :protocol_io, :send_data
       def_delegators :@network_state, :local_node_id
 
       def initialize(network_state, peer: nil, protocol: nil, protocol_io: nil)
@@ -44,9 +43,28 @@ module Ciri
         @protocol_io = protocol_io
       end
 
+      def send_data(code, data, peer: self.peer, protocol: self.protocol.name)
+        ensure_peer(peer).find_protocol_io(protocol).send_data(code, data)
+      end
+
       def raw_local_node_id
         @raw_local_node_id ||= local_node_id.to_bytes
       end
+
+      def peers
+        @network_state.peers.values
+      end
+
+      def find_peer(raw_node_id)
+        @network_state.peers[raw_node_id]
+      end
+
+      private
+
+      def ensure_peer(peer)
+        return peer if peer.is_a?(P2P::Peer)
+        @network_state.peers[peer]
+      end
     end
 
   end

data/lib/ciri/p2p/version.rb

@@ -1,6 +1,6 @@
 module Ciri
   module P2P
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciri-p2p
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - jjy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ciri-utils