zold 0.24.3 → 0.24.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f141b00987a42599c720d88c575c143a9042ea23742913605b729cbb422336c
-  data.tar.gz: 07a5846062d9fb519954f95e781c4f21beec04fef41dcb87b4796d28806839a6
+  metadata.gz: 6b50bb9c273ecfd4c2a41b71b3c42ae9c05649e6c172eb83a5e70ebd27dbbc71
+  data.tar.gz: 43c8777897f0da8778e2a9de36056d70aefe73edd4f16d3411d03a0fc0686225
 SHA512:
-  metadata.gz: 80a05326c5e6617cf9d840cde37078e6acaf6b8a88f9c175f711a4704454e7410d4e5dcc63b7433953d278d556aa8ef44bef556ec8ee0a6dd147421b642568dd
-  data.tar.gz: 464a2a34649948507b5fc321ff419005d2786ae16fa8ec6e2751f50e2b9b2095945a4e25e054748f4144aed07891b7a44420ac5db75bc0830690fee9f1304be8
+  metadata.gz: 3c52d1bce704d1a5dc3d0774579292ffc35d1b4bb6679cd71d5b17a60bb0e066b352e12ce266a74a2bbc7882aa348896cafdf662b6a913e73d64819a35a3b5db
+  data.tar.gz: 8e74954163cb768ea54a041e8c3b8277113eae58c521b8748c9c1cd0a4c65f43259ac157e4f83f02aff89bd8ebb521e00d55de0b30ffa403901ac6a88ff9fd37

data/lib/zold/commands/node.rb

@@ -263,6 +263,9 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
       Front.set(:opts, opts)
       Front.set(:dump_errors, opts['dump-errors'])
       Front.set(:port, opts['bind-port'])
+      async_dir = File.join(home, '.zoldata/async-entrance')
+      FileUtils.mkdir_p(async_dir)
+      Front.set(:async_dir, async_dir)
       Front.set(:node_alias, node_alias(opts, address))
       entrance = SafeEntrance.new(
         NoSpamEntrance.new(
@@ -283,7 +286,7 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
                 ignore_score_weakeness: opts['ignore-score-weakness'],
                 tolerate_edges: opts['tolerate-edges']
               ),
-              File.join(home, '.zoldata/async-entrance'),
+              async_dir,
               log: @log,
               queue_limit: opts['queue-limit']
             ),

data/lib/zold/node/async_entrance.rb

@@ -64,7 +64,11 @@ module Zold
         file = File.join(@dir, f)
         if /^[0-9a-f]{16}-/.match?(f)
           id = f.split('-')[0]
-          @queue << { id: Id.new(id), file: file }
+          if exists?(id, IO.read(file))
+            @queue << { id: Id.new(id), file: file }
+          else
+            File.delete(file)
+          end
         else
           File.delete(file)
         end
@@ -95,21 +99,38 @@ module Zold
         )
       end
       start = Time.now
-      loop do
-        uuid = SecureRandom.uuid
-        file = File.join(@dir, "#{id}-#{uuid}")
-        next if File.exist?(file)
-        IO.write(file, body)
-        @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)}")
-        break
+      unless exists?(id, body)
+        loop do
+          uuid = SecureRandom.uuid
+          file = File.join(@dir, "#{id}-#{uuid}")
+          next if File.exist?(file)
+          IO.write(file, body)
+          @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)}")
+          break
+        end
       end
       [id]
     end
 
     private
 
+    # Returns TRUE if a file for this wallet is already in the queue.
+    def exists?(id, body)
+      DirItems.new(@dir).fetch.each do |f|
+        next unless f.start_with?("#{id}-")
+        return true if safe_read(File.join(@dir, f)) == body
+      end
+      false
+    end
+
+    def safe_read(file)
+      IO.read(file)
+    rescue Errno::ENOENT
+      ''
+    end
+
     def take
       start = Time.now
       item = @queue.pop

data/lib/zold/node/front.rb

@@ -36,6 +36,7 @@ require_relative '../wallet'
 require_relative '../age'
 require_relative '../copies'
 require_relative '../log'
+require_relative '../dir_items'
 require_relative '../tax'
 require_relative '../id'
 require_relative '../http'
@@ -80,6 +81,7 @@ module Zold
       set :copies, nil # to be injected at node.rb
       set :node_alias, nil # to be injected at node.rb
       set :zache, nil # to be injected at node.rb
+      set :async_dir, nil # to be injected at node.rb
     end
     use Rack::Deflater
 
@@ -441,6 +443,10 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
       processes.join("\n")
     end
 
+    get '/queue' do
+      DirItems.new(settings.async_dir).fetch.select { |f| /^[0-9a-f]{16}-/.match?(f) }.join("\n")
+    end
+
     not_found do
       status(404)
       content_type('text/plain')

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.24.3'
+  VERSION = '0.24.4'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/node/test_front.rb

@@ -86,6 +86,7 @@ class FrontTest < Zold::Test
           '/ledger.json',
           '/metronome',
           '/score',
+          '/queue',
           '/trace',
           '/threads',
           '/ps'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.24.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -764,7 +764,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.24.3!
+  Thanks for installing Zold 0.24.4!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io