buschtelefon 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f97ac74a59e40f443954b18c858d246268a48a0f
-  data.tar.gz: f417f27ecc8f99c09de25b25a69d85dab46dba03
+  metadata.gz: 647eca794f57af404842ca0e5807e7c9ef57bcd8
+  data.tar.gz: 05b6225fbcb926ad2e286dbe0904ea6b322af450
 SHA512:
-  metadata.gz: 2c685fb7c0adbb17d41cea04bdef2c5f94f50ad9bfb5ce63e8886493251e0bdd096514232138da92691f6581c9807e4256dfa9c34c09d24c8961ef769eab6619
-  data.tar.gz: 83ae7243238be220fd6dc57428df6961f3859388999e0afcec3a3d024c0df33d654af770c80e286371aeb3c3921634acf82348cd78f0cf581f77a52bd8281de6
+  metadata.gz: 6ff6c5e1dc9e2aa907f7ec47eef2b2246dbf1ced27ddd7050693527dbb4121d0966092cccebeb22410626ecb0f617198d31a0346b94a910dc61ceb5f48492e58
+  data.tar.gz: 571f2b5304c578859118b149c73ed3b72a8710ab212d5a5ca318d7823364a1d2827db4e7b680129c12c346de70f4f028b2c773871821f336cf9b593aeb69e2d6

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.4.0
+
+* `NetTattler` now sends inquired payload back to requester
+* `NetTattler` now attaches source information to gossip processor
+* `NetTattler` now listens on a system chosen port per default
+* `NetTattler` now connects to remotes via `connect_remote` and sends packets
+  to them via its outbound port (so it can receive responses)
+* We work with IPs now instead of host names
+* Default `Brain` capacity is now infinite
+* `Tattler` now can load messages directly into its brain
+
 ## 0.3.0
 
 * `NetTattler` now yields a `Gossip` instead of a raw message string.

data/README.md

@@ -40,7 +40,7 @@ include Buschtelefon
 
 aunt_may = NetTattler.new
 aunt_ruth = NetTattler.new
-remote_aunt_ruth = RemoteTattler.new(host: 'localhost', port: aunt_ruth.port)
+remote_aunt_ruth = RemoteTattler.new(host: '127.0.0.1', port: aunt_ruth.port)
 
 aunt_may.connect(remote_aunt_ruth)
 

data/bin/run

@@ -36,13 +36,19 @@ tattlers[:E].connect(tattlers[:D])
 puts 'Feeding locals'
 tattlers[:A].feed(Gossip.new('Tezos'))
 
-josua = NetTattler.new
 simon = NetTattler.new
-remote_simon = RemoteTattler.new(host: 'localhost', port: simon.port)
-
-josua.connect(remote_simon)
+josua = NetTattler.new
+remote_simon = josua.connect_remote(host: '127.0.0.1', port: simon.port)
 
-Thread.new { josua.listen }
-Thread.new { simon.listen }
+threads = [
+  Thread.new { josua.listen { |gossip, source| puts "I'm Josua, I got \"#{gossip.message}\" from #{source}" } },
+  Thread.new { simon.listen { |gossip, source| puts "I'm Simon, I got \"#{gossip.message}\" from #{source}" } }
+]
 
+sleep(0.1)
 remote_simon.feed(Gossip.new('Antshare'))
+sleep(0.1)
+remote_simon.inquire
+sleep(0.1)
+
+threads.each(&:exit)

data/lib/buschtelefon/brain.rb

@@ -2,7 +2,7 @@ module Buschtelefon
   class Brain
     attr_reader :capacity
 
-    def initialize(capacity = 100)
+    def initialize(capacity = nil)
       @capacity = capacity
       @gossip_sink = []
     end
@@ -25,7 +25,9 @@ module Buschtelefon
     def reorganize
       @gossip_sink.sort! { |x, y| y.created_at <=> x.created_at }
       @gossip_sink.uniq!(&:message)
-      @gossip_sink.slice!(capacity..-1) # only keep the newest
+      if @capacity
+        @gossip_sink.slice!(capacity..-1) # only keep the newest
+      end
     end
   end
 end

data/lib/buschtelefon/net_tattler.rb

@@ -3,36 +3,70 @@ require_relative 'tattler'
 
 module Buschtelefon
   class NetTattler < Tattler
-    attr_accessor :port
+    attr_accessor :port, :socket
 
-    def initialize(port: nil)
+    def initialize(port: 0)
       super()
-      @port = port || rand(1025..65365) # TODO: use port 0
+      @socket = UDPSocket.new
+      @socket.bind('127.0.0.1', port)
+      @port = @socket.local_address.ip_port
     end
 
     def listen(&_callback)
       puts "Started UDP server on #{@port}..."
 
-      Socket.udp_server_loop(@port) do |message, message_source|
-        # puts "Got \"#{message}\" from #{message_source}"
+      Socket.udp_server_loop_on([@socket]) do |message, message_source|
+        remote_tattler = find_or_build_remote_tattler(
+          host: message_source.remote_address.ip_address,
+          port: message_source.remote_address.ip_port
+        )
+
         if message == "\x05"
-          handle_knowledge_inquiry(message_source)
+          #puts "#{@port} got inquiry from #{remote_tattler}. Is connected to #{@connections.inspect}"
+          handle_knowledge_inquiry(remote_tattler)
         else
           gossip = Gossip.new(message)
           handle_incoming_gossip(gossip)
-          yield(gossip) if block_given?
+          yield(gossip, remote_tattler) if block_given?
         end
       end
     end
 
+    def connect_remote(host:, port:)
+      find_or_build_remote_tattler(host: host, port: port).tap do |remote_tattler|
+        connect(remote_tattler)
+      end
+    end
+
+    def inquire_remote_neighbors
+      remote_connections.each { |remote_tattler| remote_tattler.inquire }
+    end
+
+    def remote_connections
+      @connections.select { |tattler| tattler.is_a?(RemoteTattler) }
+    end
+
+    def to_s
+      "127.0.0.1:#{@port}"
+    end
+
     private
 
     def handle_incoming_gossip(gossip)
       feed(gossip)
     end
 
-    def handle_knowledge_inquiry(message_source)
-      transfer_knowledge(RemoteTattler.new(message_source.local_address))
+    # We just give out everything to the outbound port of the inquiry source
+    def handle_knowledge_inquiry(remote_tattler)
+      transfer_knowledge(remote_tattler)
+    end
+
+    def find_or_build_remote_tattler(host:, port:)
+      remote_connections.find { |t| t.host == host && t.port == port  } || build_remote_tattler(host: host, port: port)
+    end
+
+    def build_remote_tattler(host:, port:)
+      RemoteTattler.new(host: host, port: port, outbound_socket: @socket)
     end
   end
 end

data/lib/buschtelefon/remote_tattler.rb

@@ -1,17 +1,27 @@
 require 'socket'
 
 module Buschtelefon
-  # No need to inherit from Tattler in Ruby
+  # No need to inheritance from Tattler because not all its features are available here (only #feed)
   class RemoteTattler
-    def initialize(host:, port:)
+    attr_reader :host, :port
+
+    def initialize(host:, port:, outbound_socket: UDPSocket.new)
       @host = host
       @port = port
-      @outbound_socket = UDPSocket.new
+      @outbound_socket = outbound_socket
     end
 
     def feed(gossip)
+      #puts "#{@outbound_socket.local_address.ip_port} sending #{JSON.parse(gossip.message)['number']} to #{@port}"
       @outbound_socket.send(gossip.message, 0, @host, @port)
-      # puts "Sent \"#{gossip.message}\" to #{@host}:#{@port}"
+    end
+
+    def inquire
+      @outbound_socket.send("\x05", 0, @host, @port)
+    end
+
+    def to_s
+      "#{@host}:#{@port}"
     end
   end
 end

data/lib/buschtelefon/tattler.rb

@@ -7,6 +7,10 @@ module Buschtelefon
       @brain = Brain.new
     end
 
+    def load_messages(messages)
+      messages.each { |message| @brain << Gossip.new(message) }
+    end
+
     def knowledge
       @brain.to_a
     end

data/lib/buschtelefon/version.rb

@@ -1,3 +1,3 @@
 module Buschtelefon
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buschtelefon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Josua Schmid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler