zold 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb875c3b804c4d045fc34d2e00ad415d2d29a370
-  data.tar.gz: 9562b642f01203ff7560dcd43d72c7edab08cb2d
+  metadata.gz: 76a4eedb7d10def207298c7f125a6c9fbe392bec
+  data.tar.gz: 04f8e073cea64e11e7989d1c943a629295e45425
 SHA512:
-  metadata.gz: ac0fc271a65b8fd7284398dba3e67ab515f7d06942e12a10d27e654433907191ab1abeabb9767384296bb5259ff3387cb4ecf3a59b917d6f9c6b1a09a4ea698b
-  data.tar.gz: 5be7344fecc4fc4d9376b16c45c43a5a25ca6a451386b4ecca734a73358c3257c91e8e5a1a98fd73323c683c4c81be854b8497548ea0529ae4c81e6e9ed24edc
+  metadata.gz: b70bdc247fa5230a8a6709578d603f1e7a87f8b3a758abc663dc5cf603136f49f8049a1df90fb709c728cf8a9d8b4ca9fcedbc9b0e15ee209ec2556cffe996be
+  data.tar.gz: 9dbfe9ece397a9ef7a6ee65e771ac560fe4aacc2ceb1ac77d291bb53b0d263ddc4349ae45e00ecc8c47564dab15f304a639e6440828325a7cded1a2e7de4db52

data/lib/zold/commands/fetch.rb

@@ -64,50 +64,28 @@ Available options:"
 
     def fetch(id, cps, opts)
       total = 0
-      @remotes.all.each do |r|
-        done = fetch_one(id, r, cps, opts)
-        if done
-          total += 1
-        else
-          @remotes.error(r[:host], r[:port])
-        end
+      @remotes.iterate(@log) do |r|
+        fetch_one(id, r, cps, opts)
+        total += 1
       end
       @log.debug("#{total} copies of #{id} fetched, there are #{cps.all.count} available locally")
     end
 
     def fetch_one(id, r, cps, opts)
-      address = "#{r[:host]}:#{r[:port]}".downcase
-      if opts['ignore-node'].include?(address)
-        @log.info("#{address} ignored because of --ignore-node")
-        return false
-      end
-      uri = URI("#{r[:home]}wallet/#{id}")
-      res = Http.new(uri).get
-      if res.code == '404'
-        @log.info("#{address} wallet #{id} #{Rainbow('not found').red}")
-        return false
-      end
-      unless res.code == '200'
-        @log.error("#{address} #{Rainbow(res.code).red}/#{res.message} at #{uri}")
+      if opts['ignore-node'].include?(r.to_s)
+        @log.info("#{r} ignored because of --ignore-node")
         return false
       end
+      res = r.http("/wallet/#{id}").get
+      raise "Wallet #{id} not found" if res.code == '404'
+      raise "#{res.code} \"#{res.message}\"" unless res.code == '200'
       json = JSON.parse(res.body)
       score = Score.parse_json(json['score'])
-      unless score.valid?
-        @log.error("#{address}: invalid score: #{score}")
-        return false
-      end
-      if score.expired?
-        @log.error("#{address}: score expired: #{score}")
-        return false
-      end
-      if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-        @log.error("#{address} score is too weak (#{score.strength}<#{Score::STRENGTH}): #{score}")
-        return false
-      end
+      raise "Invalid score #{score}" unless score.valid?
+      raise "Score expired #{score}" if score.expired?
+      raise "Score is too weak #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
       cps.add(json['body'], score.host, score.port, score.value)
-      @log.info("#{address} #{json['body'].length}b/#{Rainbow(score.value).green} (#{json['version']})")
-      true
+      @log.info("#{r} #{json['body'].length}b/#{Rainbow(score.value).green} (#{json['version']})")
     end
   end
 end

data/lib/zold/commands/node.rb

@@ -112,6 +112,9 @@ module Zold
         threads: opts[:threads], strength: opts[:strength]
       )
       Zold::Front.set(:farm, farm)
+      Thread.start do
+        Zold::Remote.new(remotes: remotes, farm: farm, log: @log).run(%w[remote update]) unless best.nil?
+      end
       @log.debug('Starting up the web front...')
       begin
         Zold::Front.run!

data/lib/zold/commands/push.rb

@@ -49,44 +49,27 @@ Available options:"
       mine = Args.new(opts, @log).take || return
       mine = @wallets.all if mine.empty?
       mine.each do |id|
-        push(@wallets.find(Id.new(id)), opts)
+        wallet = @wallets.find(Id.new(id))
+        raise "The wallet #{id} is absent" unless wallet.exists?
+        push(wallet, opts)
       end
     end
 
     def push(wallet, _)
-      raise 'The wallet is absent' unless wallet.exists?
       total = 0
-      @remotes.all.each do |r|
-        uri = URI("#{r[:home]}wallet/#{wallet.id}")
-        response = Http.new(uri).put(File.read(wallet.path))
+      @remotes.iterate(@log) do |r|
+        response = r.http("/wallet/#{wallet.id}").put(File.read(wallet.path))
         if response.code == '304'
-          @log.info("#{uri}: same version there")
-          next
-        end
-        unless response.code == '200'
-          @remotes.error(r[:host], r[:port])
-          @log.error("#{uri} failed as #{response.code}/#{response.message}")
-          @log.debug(response.body) unless response.body.empty?
+          @log.info("#{r}: same version there")
           next
         end
+        raise "#{response.code} \"#{response.message}\" at #{response.body}" unless response.code == '200'
         json = JSON.parse(response.body)['score']
         score = Score.parse_json(json)
-        unless score.valid?
-          @remotes.error(r[:host], r[:port])
-          @log.error("#{uri} invalid score: #{score}")
-          next
-        end
-        if score.expired?
-          @remotes.error(r[:host], r[:port])
-          @log.error("#{uri} expired score: #{score}")
-          next
-        end
-        if score.strength < Score::STRENGTH
-          @remotes.error(r[:host], r[:port])
-          @log.error("#{uri} score is too weak")
-          next
-        end
-        @log.info("#{uri} accepted: #{Rainbow(score.value).green}")
+        raise "Invalid score #{score}" unless score.valid?
+        raise "Expired score #{score}" if score.expired?
+        raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
+        @log.info("#{r} accepted: #{Rainbow(score.value).green}")
         total += score.value
       end
       @log.info("Total score is #{total}")

data/lib/zold/commands/remote.rb

@@ -115,42 +115,15 @@ Available options:"
 
     def update(opts, deep = true)
       capacity = []
-      @remotes.all.each do |r|
-        uri = URI("#{r[:home]}remotes")
-        res = Http.new(uri).get
-        unless res.code == '200'
-          @remotes.error(r[:host], r[:port])
-          @log.info("#{Rainbow(r[:host]).red} #{res.code} \"#{res.message}\" #{uri}")
-          next
-        end
-        begin
-          json = JSON.parse(res.body)
-        rescue JSON::ParserError => e
-          error(r[:host], r[:port])
-          @log.info("#{Rainbow(r[:host]).red} \"#{e.message}\": #{res.body}")
-          next
-        end
+      @remotes.iterate(@log) do |r|
+        res = r.http('/remotes').get
+        raise "#{res.code} \"#{res.message}\"" unless res.code == '200'
+        json = JSON.parse(res.body)
         score = Score.parse_json(json['score'])
-        unless score.valid?
-          error(r[:host], r[:port])
-          @log.info("#{Rainbow(r[:host]).red} invalid score: #{score}")
-          next
-        end
-        if score.expired?
-          error(r[:host], r[:port])
-          @log.info("#{Rainbow(r[:host]).red} expired score: #{score}")
-          next
-        end
-        if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-          error(r[:host], r[:port])
-          @log.info("#{Rainbow(r[:host]).red} score too weak: #{score.strength}")
-          next
-        end
-        if r[:host] != score.host || r[:port] != score.port
-          @remotes.error(r[:host], r[:port])
-          @remotes.add(score.host, score.port)
-          @log.info("#{r[:host]}:#{r[:port]} renamed to #{score.host}:#{score.port}")
-        end
+        raise "Invalid score #{score}" unless score.valid?
+        raise "Expired score #{score}" if score.expired?
+        raise "Score too weak: #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
+        raise "Masqueraded as #{score.host}:#{score.port}" if r.host != score.host || r.port != score.port
         @remotes.rescore(score.host, score.port, score.value)
         if deep
           json['all'].each do |s|
@@ -158,7 +131,7 @@ Available options:"
           end
         end
         capacity << { host: score.host, port: score.port, count: json['all'].count }
-        @log.info("#{r[:host]}:#{r[:port]}: #{Rainbow(score.value).green} (#{json['version']})")
+        @log.info("#{r}: #{Rainbow(score.value).green} (#{json['version']})")
       end
       max_capacity = capacity.map { |c| c[:count] }.max || 0
       capacity.each do |c|

data/lib/zold/commands/taxes.rb

@@ -117,37 +117,15 @@ Available options:"
 
     def top_scores
       best = []
-      @remotes.all.each do |r|
-        uri = URI(r[:home])
-        name = "#{r[:host]}:#{r[:port]}"
-        res = Http.new(uri).get
-        unless res.code == '200'
-          @log.info("#{name}: #{Rainbow(res.code).red} \"#{res.message}\" at #{uri}")
-          next
-        end
-        begin
-          json = JSON.parse(res.body)
-        rescue JSON::ParserError => e
-          @log.info("#{name}: #{Rainbow('broken').red} JSON \"#{e.message}\": #{res.body}")
-          next
-        end
+      @remotes.iterate(@log) do |r|
+        res = r.http.get
+        raise "#{res.code} \"#{res.message}\" at #{res.body}" unless res.code == '200'
+        json = JSON.parse(res.body)
         score = Score.parse_json(json['score'])
-        unless score.valid?
-          @log.info("#{name}: #{Rainbow('invalid').red} score")
-          next
-        end
-        if score.expired?
-          @log.info("#{name}: #{Rainbow('expired').red} score")
-          next
-        end
-        if score.strength < Score::STRENGTH
-          @log.info("#{name} score #{Rainbow(score.value).red} is too weak (<#{Score::STRENGTH})")
-          next
-        end
-        if score.value < Tax::EXACT_SCORE
-          @log.info("#{name} score #{Rainbow(score.value).red} is too small (<#{Tax::EXACT_SCORE})")
-          next
-        end
+        raise "Invalid score #{score}" unless score.valid?
+        raise "Expired score #{score}" if score.expired?
+        raise "Score is too weak (<#{Score::STRENGTH}) #{score}" if score.strength < Score::STRENGTH
+        raise "Score is too small (<#{Tax::EXACT_SCORE})" if score.value < Tax::EXACT_SCORE
         @log.info("#{score.host}:#{score.port}: #{Rainbow(score.value).green}")
         best << score
       end

data/lib/zold/http.rb

@@ -75,7 +75,7 @@ module Zold
         'Connection': 'close'
       }
       headers[Http::VERSION_HEADER] = VERSION
-      headers[Http::SCORE_HEADER] = score.reduced(4).to_s if @score.valid? && @score.value >= 3 && !score.expired?
+      headers[Http::SCORE_HEADER] = @score.reduced(4).to_s if @score.valid? && @score.value >= 3 && !score.expired?
       headers
     end
   end

data/lib/zold/node/farm.rb

@@ -29,6 +29,13 @@ require_relative '../score'
 module Zold
   # Farm
   class Farm
+    # Empty farm
+    class Empty
+      def best
+        []
+      end
+    end
+
     attr_reader :best
     def initialize(invoice, log: Log::Quiet.new)
       @log = log

data/lib/zold/remotes.rb

@@ -21,6 +21,7 @@
 require 'csv'
 require 'uri'
 require 'fileutils'
+require_relative 'node/farm'
 
 # The list of remotes.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -29,6 +30,7 @@ require 'fileutils'
 module Zold
   # All remotes
   class Remotes
+    # The default TCP port all nodes are supposed to use.
     PORT = 4096
 
     # Empty, for standalone mode
@@ -36,10 +38,34 @@ module Zold
       def all
         []
       end
+
+      def iterate(_)
+        # Nothing to do here
+      end
+    end
+
+    # One remote.
+    class Remote
+      attr_reader :host, :port
+      def initialize(host, port, score)
+        @host = host
+        @port = port
+        @score = score
+      end
+
+      def http(path = '/')
+        uri = URI("http://#{@host}:#{@port}#{path}")
+        Http.new(uri, @score)
+      end
+
+      def to_s
+        "#{@host}:#{@port}"
+      end
     end
 
-    def initialize(file)
+    def initialize(file, farm = Farm::Empty.new)
       @file = file
+      @farm = farm
     end
 
     def all
@@ -89,16 +115,19 @@ module Zold
       save(list)
     end
 
-    def score(host, port = Remotes::PORT)
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      raise "#{host}:#{port} is absent" unless exists?(host, port)
-      load.find { |r| r[:host] == host.downcase && r[:port] == port }[:score]
-    end
-
-    def errors(host, port = Remotes::PORT)
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      raise "#{host}:#{port} is absent" unless exists?(host, port)
-      load.find { |r| r[:host] == host.downcase && r[:port] == port }[:errors]
+    def iterate(log)
+      best = @farm.best[0]
+      require_relative 'score'
+      score = best.nil? ? Score::ZERO : best
+      all.each do |r|
+        begin
+          yield Remotes::Remote.new(r[:host], r[:port], score)
+        rescue StandardError => e
+          error(r[:host], r[:port])
+          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message}")
+          log.debug(e.backtrace[0..5].join("\n\t"))
+        end
+      end
     end
 
     def error(host, port = Remotes::PORT)

data/lib/zold/score.rb

@@ -48,10 +48,8 @@ module Zold
       @strength = strength
     end
 
-    ZERO = Score.new(
-      Time.now, 'localhost',
-      Remotes::PORT, 'NOPREFIX@ffffffffffffffff'
-    )
+    # The default no-value score.
+    ZERO = Score.new(Time.now, 'localhost', 80, 'NOPREFIX@ffffffffffffffff')
 
     def self.parse_json(json)
       raise "Time in JSON is broken: #{json}" unless json['time'] =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.9.10'.freeze
+  VERSION = '0.9.11'.freeze
 end

data/test/test_remotes.rb

@@ -65,7 +65,9 @@ class TestRemotes < Minitest::Test
       remotes = Zold::Remotes.new(file)
       remotes.add('127.0.0.1', 80)
       remotes.rescore('127.0.0.1', 80, 15)
-      assert_equal(remotes.score('127.0.0.1', 80), 15)
+      remotes.all.each do |r|
+        assert_equal(15, r[:score])
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Yegor Bugayenko