zold 0.16.17 → 0.16.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294ae5c8edd1bfd6c8f8567f5e19161356d656d87a04050e29c82bcf5a5303cf
-  data.tar.gz: 63646cc0ed79fcb7de5c1c9498db578248aa6ff3e22a840138ccede01eed468e
+  metadata.gz: de86dbcab88573c76088a862afd47563bebee0d62df73b695bdae79dc2e47778
+  data.tar.gz: 76f9b1a004ff1ef24acf833626b128bff9ac7663e16bc10c7a476e4667b349fc
 SHA512:
-  metadata.gz: 31dc5ac7025b04c949c0ee1329bcdc773fa159322437c665b48722b3e21a2295f37ba465f5bc7df13cf5d7654a3e234bfaf999399b9c0fc9bbe42881995226d5
-  data.tar.gz: 7e79554604ca13438cd05c467ce6f46274a8bbbb7bbedfee84e3d28ea8989f4707d7ad924e6c896108e6a282baee7c02cee76533f75ec78353eb070f9f823383
+  metadata.gz: 68cf2ad85d6eeaf93cb9d32d1e84f8c25c96f70826ca4dc9e68140e89c32bd9d9e584fcc94e9ccc7fbfcaec0e1e9b2c3c2a51313f717af97da577bf517ae7ade
+  data.tar.gz: 2c45d5fee9bf53f9e2e09e9e961c3004755574fd23a5840c93767b15beba9b3c236464fd299b70b39b846a3126b4ce66792bb29f608158f5af69fbc94ae3bf9c

data/lib/zold/http.rb

@@ -55,10 +55,10 @@ module Zold
     PROTOCOL_HEADER = 'X-Zold-Protocol'
 
     # Read timeout in seconds
-    READ_TIMEOUT = 0.4
+    READ_TIMEOUT = 1
 
     # Connect timeout in seconds
-    CONNECT_TIMEOUT = 0.2
+    CONNECT_TIMEOUT = 0.4
 
     def initialize(uri:, score: Score::ZERO, network: 'test')
       @uri = uri.is_a?(URI) ? uri : URI(uri)
@@ -69,11 +69,11 @@ module Zold
     def get(timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.use_ssl = @uri.scheme == 'https'
-      http.read_timeout = Http::READ_TIMEOUT
+      http.read_timeout = timeout
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      Timeout.timeout(timeout) do
+      Timeout.timeout(timeout + Http::CONNECT_TIMEOUT) do
         http.request_get(path, headers)
       end
     rescue StandardError => e
@@ -83,11 +83,11 @@ module Zold
     def put(body, timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.use_ssl = @uri.scheme == 'https'
-      http.read_timeout = Http::READ_TIMEOUT
+      http.read_timeout = timeout
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      Timeout.timeout(timeout) do
+      Timeout.timeout(timeout + Http::CONNECT_TIMEOUT) do
         http.request_put(
           path, body,
           headers.merge(

data/lib/zold/id.rb

@@ -31,6 +31,7 @@ module Zold
       if id.nil?
         @id = rand(2**32..2**64 - 1)
       else
+        raise "Invalid wallet ID type: #{id.class.name}" unless id.is_a?(String)
         raise "Invalid wallet ID: #{id}" unless id =~ /^[0-9a-fA-F]{16}$/
         @id = Integer("0x#{id}", 16)
       end

data/lib/zold/node/async_entrance.rb

@@ -38,28 +38,33 @@ module Zold
   class AsyncEntrance
     def initialize(entrance, dir, log: Log::Quiet.new, threads: [Concurrent.processor_count, 4].max)
       @entrance = entrance
-      @dir = dir
+      @dir = File.expand_path(dir)
       @log = log
       @total = threads
-      @mutex = Mutex.new
+      @queue = Queue.new
     end
 
     def to_json
       @entrance.to_json.merge(
-        'queue': queue.count,
+        'queue': @queue.size,
         'threads': @threads.count
       )
     end
 
     def start
       raise 'Block must be given to start()' unless block_given?
+      FileUtils.mkdir_p(@dir)
+      DirItems.new(@dir).fetch.select { |f| f =~ /^[0-9a-f]{16}-/ }.each do |f|
+        file = File.join(@dir, f)
+        id = f.split('-')[0]
+        @queue << { id: Id.new(id), file: file }
+      end
+      @log.info("#{@queue.size} wallets pre-loaded into async_entrace from #{@dir}") unless @queue.size.zero?
       @entrance.start do
-        FileUtils.mkdir_p(@dir)
         @threads = (0..@total - 1).map do |i|
           Thread.start do
             Endless.new("async-e##{i}", log: @log).run do
               take
-              sleep(1)
             end
           end
         end
@@ -73,14 +78,15 @@ module Zold
 
     # Always returns an array with a single ID of the pushed wallet
     def push(id, body)
-      raise "Queue is too long (#{queue.count} wallets), try again later" if queue.count > 256
+      raise "Queue is too long (#{@queue.size} wallets), try again later" if @queue.size > 256
       start = Time.now
       loop do
         uuid = SecureRandom.uuid
         file = File.join(@dir, "#{id}-#{uuid}")
         next if File.exist?(file)
         IO.write(file, body)
-        @log.debug("Added #{id}/#{Size.new(body.length)} to the queue at pos.#{queue.count} \
+        @queue << { id: id, file: file }
+        @log.debug("Added #{id}/#{Size.new(body.length)} to the queue at pos.#{@queue.size} \
 in #{Age.new(start, limit: 0.05)}: #{uuid}")
         break
       end
@@ -91,23 +97,13 @@ in #{Age.new(start, limit: 0.05)}: #{uuid}")
 
     def take
       start = Time.now
-      id, body = @mutex.synchronize do
-        opts = queue
-        return if opts.empty?
-        file = File.join(@dir, opts[0])
-        id = opts[0].split('-')[0]
-        Thread.current.thread_variable_set(:wallet, id)
-        body = IO.read(file)
-        FileUtils.rm_f(file)
-        [id, body]
-      end
-      @entrance.push(Id.new(id), body)
-      @log.debug("Pushed #{id}/#{Size.new(body.length)} to #{@entrance.class.name} \
-in #{Age.new(start, limit: 0.1)} (#{queue.count} still in the queue)")
-    end
-
-    def queue
-      DirItems.new(@dir).fetch.select { |f| f =~ /^[0-9a-f]{16}-/ }
+      item = @queue.pop
+      Thread.current.thread_variable_set(:wallet, item[:id].to_s)
+      body = IO.read(item[:file])
+      FileUtils.rm_f(item[:file])
+      @entrance.push(item[:id], body)
+      @log.debug("Pushed #{item[:id]}/#{Size.new(body.length)} to #{@entrance.class.name} \
+in #{Age.new(start, limit: 0.1)} (#{@queue.size} still in the queue)")
     end
   end
 end

data/lib/zold/node/entrance.rb

@@ -92,7 +92,7 @@ module Zold
         @history.shift if @history.length >= 16
         @speed.shift if @speed.length >= 64
         @wallets.find(id) do |wallet|
-          @history << "#{id}/#{sec}/#{modified.count}/#{wallet.mnemo}"
+          @history << "#{sec}/#{modified.count}/#{wallet.mnemo}"
         end
         @speed << sec
       end

data/lib/zold/node/farmers.rb

@@ -71,7 +71,7 @@ for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")
             buffer = +''
             loop do
               begin
-                buffer << stdout.read_nonblock(1024)
+                buffer << stdout.read_nonblock(16 * 1024)
                 # rubocop:disable Lint/HandleExceptions
               rescue IO::WaitReadable => _
                 # rubocop:enable Lint/HandleExceptions
@@ -85,7 +85,7 @@ for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")
                 raise "Failed to calculate the score (##{thr.value}): #{buffer}" unless thr.value.to_i.zero?
                 break
               end
-              sleep(10)
+              sleep(1)
               Thread.current.thread_variable_set(:buffer, buffer.length.to_s)
             end
             after = Score.parse(buffer.strip)

data/lib/zold/node/front.rb

@@ -230,7 +230,7 @@ in #{Age.new(@start, limit: 1)}")
           score: score.to_h,
           wallets: total_wallets,
           mtime: wallet.mtime.utc.iso8601,
-          size: File.size(wallet.path),
+          size: wallet.size,
           digest: wallet.digest,
           copies: Copies.new(File.join(settings.copies, id)).all.count,
           balance: wallet.balance.to_i,
@@ -313,7 +313,7 @@ in #{Age.new(@start, limit: 1)}")
           "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)",
           "Transactions: #{wallet.txns.count}",
           "Taxes: #{Tax.new(wallet).paid} paid, the debt is #{Tax.new(wallet).debt}",
-          "File size: #{File.size(wallet.path)} bytes (#{Copies.new(File.join(settings.copies, id)).all.count} copies)",
+          "File size: #{wallet.size} bytes (#{Copies.new(File.join(settings.copies, id)).all.count} copies)",
           "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)",
           "Digest: #{wallet.digest}"
         ].join("\n")

data/lib/zold/node/nodup_entrance.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'tempfile'
+require 'openssl'
 require_relative '../log'
 require_relative '../size'
 require_relative '../wallet'
@@ -33,11 +34,8 @@ module Zold
   # The safe entrance
   class NoDupEntrance
     def initialize(entrance, wallets, log: Log::Quiet.new)
-      raise 'Entrance can\'t be nil' if entrance.nil?
       @entrance = entrance
-      raise 'Wallets can\'t be nil' if wallets.nil?
       @wallets = wallets
-      raise 'Log can\'t be nil' if log.nil?
       @log = log
     end
 
@@ -52,25 +50,14 @@ module Zold
 
     # Returns a list of modifed wallets (as Zold::Id)
     def push(id, body)
-      raise 'Id can\'t be nil' if id.nil?
-      raise 'Id must be of type Id' unless id.is_a?(Id)
-      raise 'Body can\'t be nil' if body.nil?
-      Tempfile.open(['', Wallet::EXT]) do |f|
-        IO.write(f, body)
-        wallet = Wallet.new(f.path)
-        wallet.refurbish
-        after = IO.read(wallet.path)
-        before = @wallets.find(id) do |w|
-          w.exists? ? IO.read(w.path).to_s : ''
-        end
-        if before == after
-          @log.info("Duplicate of #{Size.new(after.length)} #{wallet.mnemo} ignored")
-          return []
-        end
-        @log.info("New content for #{wallet.mnemo} arrived, \
-#{Size.new(before.length)} before and #{Size.new(after.length)} after")
-        @entrance.push(id, body)
+      before = @wallets.find(id) { |w| w.exists? ? w.digest : '' }
+      after = OpenSSL::Digest::SHA256.new(body).hexdigest
+      if before == after
+        @log.debug("Duplicate of #{id} ignored (#{Size.new(body.length)} bytes)")
+        return []
       end
+      @log.debug("New content for #{id} arrived (#{Size.new(body.length)} bytes)")
+      @entrance.push(id, body)
     end
   end
 end

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.16.17'
+  VERSION = '0.16.18'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -72,7 +72,7 @@ module Zold
     end
 
     def mnemo
-      "#{id}/#{balance.to_zld(4)}/#{txns.count}t/#{digest[0, 6]}/#{Size.new(File.size(@file))}"
+      "#{id}/#{balance.to_zld(4)}/#{txns.count}t/#{digest[0, 6]}/#{Size.new(size)}"
     end
 
     def to_text
@@ -195,6 +195,11 @@ module Zold
       list.empty? ? 0 : (Time.now - list.min_by(&:date).date) / (60 * 60)
     end
 
+    # Size of the wallet file in bytes
+    def size
+      File.size(path)
+    end
+
     def txns
       @txns.fetch
     end

data/test/test_http.rb

@@ -25,6 +25,7 @@ require 'tmpdir'
 require 'uri'
 require 'webmock/minitest'
 require 'zold/score'
+require_relative 'test__helper'
 require_relative '../lib/zold/http'
 
 # Http test.
@@ -78,6 +79,26 @@ class TestHttp < Zold::Test
     assert_equal('599', res.code)
   end
 
+  def test_doesnt_terminate_on_long_call
+    require 'random-port'
+    WebMock.allow_net_connect!
+    RandomPort::Pool::SINGLETON.acquire do |port|
+      thread = Thread.start do
+        server = TCPServer.new(port)
+        loop do
+          client = server.accept
+          sleep 1
+          client.puts("HTTP/1.1 200 OK\nContent-Length: 4\n\nGood")
+          client.close
+        end
+      end
+      res = Zold::Http.new(uri: "http://localhost:#{port}/").get(timeout: 2)
+      assert_equal('200', res.code, res)
+      thread.kill
+      thread.join
+    end
+  end
+
   def test_sends_valid_version_header
     stub_request(:get, 'http://some-host-3/')
       .with(headers: { 'X-Zold-Version' => Zold::VERSION })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.17
+  version: 0.16.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace