universa 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb1beaf2ba6ae53212fa913c1a7fddc49c6484871a3f0c54c62c3b561284fdf
-  data.tar.gz: 9f11ec4e2a52e6abfd78161f75fed790b7f32cd5348b2cf321f62c18d253d501
+  metadata.gz: ff6ba5e26ea3e8ef5c6f66da7c2e13045f752e251ff8783b990376b06f95af31
+  data.tar.gz: 543afbaaeb3813cfe082171469ef6997dfcd67ad96de62d434556c673d62d198
 SHA512:
-  metadata.gz: 1928165a250af830aa2768d728b6ef41662c57604209db3926af675eff13e8c2e1e23c116af7f291bd6555b4c8e1236f263aea2a2906ef0c4d75a2f7d8c5b5a2
-  data.tar.gz: 5964bc287b924b9d0b30d91d32a0ba4c43ef946f4fb8958914582f2ac6964fabdd446fe8a7898561d8b36973a78cfb5b8fbe52050d9cf95efba328987c41259d
+  metadata.gz: 576c85a3a975de182195866635820dcbbb2a1dc531526440aee8dbb8d35d4783db45b2cec8b0c1ac7908caaa7b57de7c4bc893412dee60e84425bd047511e422
+  data.tar.gz: 677b361b35bcfe73ed8005735123ab6eea59a3077d41646a3dbccea9bd2885169d416dcf7f7929128e46e64347b4e0d9780c4732d9470e13985b839d36101241

data/README.md

@@ -1,6 +1,7 @@
 # Universa
 
-> Alfa state: direct access to Java API ready for test. 
+> Alfa state: direct full access to Java API ready for test, started adapter of remote objects - syntax sugar 
+for direct access to remote objects.
 
 This is an under-construction official gem from [Universa][universa] to facilitate access to the
 Java library using Universa's UMI protocol.  
@@ -50,11 +51,14 @@ contract_id = contract.get_id.to_base64_string
 
 ```
 
+## Docs and resources
+
 for more information see:
 
 - [Universa gem page](https://kb.universa.io/universa_ruby_gem/131) in the Universa Knowledge Base.
 - Universa Java API: https://kb.universa.io/general_java_api/5 
 - Universa UMI server: https://kb.universa.io/umi_protocol/98
+- Ruby [docs online](https://kb.universa.io/system/static/gem_universa/)
 - Farcall [gem](https://github.com/sergeych/farcall) and [protocol](https://github.com/sergeych/farcall/wiki).
 
 ### Use UMI service (alfa state)
@@ -63,7 +67,7 @@ The Universa::Service greatly simplify work taking all boilerplate. Just create
 as is they are local:
 
 ```ruby
-key = PrivateKey,new(open('mykey.private.unikey', 'rb').read)
+key = PrivateKey.new(open('mykey.private.unikey', 'rb').read)
 contract = Contract.new(key)
 
 contract.seal()
@@ -91,4 +95,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 Everyone interacting in the Universa project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/universa/blob/master/CODE_OF_CONDUCT.md).
 
-[universa]:http://universa.io
+[universa]:http://universa.io

data/exe/universa

@@ -5,5 +5,5 @@ require "universa"
 
 puts "Checking prerequisites"
 
-puts "Found UMI version: #{UMI.new.version}"
+puts "Found UMI version: #{Universa::UMI.new.version}"
 

data/lib/universa/client.rb

@@ -0,0 +1,228 @@
+require 'boss-protocol'
+require 'open-uri'
+require 'concurrent'
+
+module Universa
+
+  using Universa
+
+  def retry_with_timeout(max_timeout = 15, max_times = 3, &block)
+    attempt = 0
+    Timeout::timeout(max_timeout, &block)
+  rescue
+    attempt += 1
+    puts "timeout: retry (#$!): #{attempt}"
+    retry if attempt < max_times
+    raise
+  end
+
+
+  module Parallel
+
+    class ParallelEnumerable < SimpleDelegator
+      include Concurrent
+
+      @@pool = CachedThreadPool.new
+
+      def each_with_index &block
+        latch = CountDownLatch.new(size)
+        __getobj__.each_with_index {|x, index|
+          @@pool << -> {
+            begin
+              block.call(x, index)
+            rescue
+              $!.print_stack_trace
+            ensure
+              latch.count_down
+            end
+          }
+        }
+        latch.wait
+      end
+
+      def each &block
+        each_with_index {|x, i| block.call(x)}
+      end
+
+
+      def map &block
+        result = size.times.map {nil}
+        each_with_index {|value, i|
+          result[i] = block.call(value)
+        }
+        result.par
+      end
+
+      alias_method :collect, :map
+    end
+
+    refine Enumerable do
+      def par
+        is_a?(ParallelEnumerable) ? self : ParallelEnumerable.new(self)
+      end
+
+      def group_by &block
+        result = {}
+        each {|value|
+          new_key = block.call(value)
+          (result[new_key] ||= []) << value
+        }
+        result
+      end
+    end
+
+  end
+
+
+  using Parallel
+
+  # Universa network client reads current network configuration and provides access to each node independently
+  # and also implement newtor-wide procedures.
+  class Client
+
+    # Create client
+    # @param [PrivateKey] private_key to connect with. Generates new one if omitted.
+    def initialize private_key = nil
+      @connection_key = private_key
+      scan_network()
+    end
+
+    # Number of accessible nodes
+    def size
+      @nodes.size
+    end
+
+    # private key used by the connection (might be generated)
+    def private_key
+      @connection_key ||= PrivateKey.new(2048)
+    end
+
+    # @return [Connection] random connection
+    def random_connection
+      @nodes.sample
+    end
+
+    # @return [Array(Connection)] array of count randomly selected connections
+    def random_connections count = 1
+      @nodes.sample(count)
+    end
+
+
+    private
+
+    # Rescan the network collecting the networ map comparing results from random 70% of nodes.
+    def scan_network
+      # Todo: cache known nodes
+      root_nodes = (1..30).map {|n| "http://node-#{n}-com.universa.io:8080/network"}
+
+      # We scan random 70% for consensus
+      n = root_nodes.size * 0.7
+
+      candidates = {}
+      root_nodes.sample(n).par.each {|path|
+        retry_with_timeout(5, 3) {
+          SmartHash.new(Boss.unpack open(path).read).response.nodes.each {|data|
+            ni = NodeInfo.new(data)
+            (candidates[ni] ||= ni).increment_rate
+          }
+        }
+      }
+      nodes = candidates.values.group_by(&:url)
+                  .transform_values!(&:sort)
+      # We roughly assume the full network size as:
+      network_max_size = nodes.size
+      nodes.each {|k, v|
+        puts "#{k}: (#{v.size}) #{v.map(&:rate)}}"
+      }
+      # Refine result: takes most voted nodes and only these with 80% consensus
+      # and map it to Connection objects
+      min_rate = n * 0.8
+      @nodes = nodes.values.map {|v| v[-1]}.delete_if {|v| v.rate < min_rate}
+                   .map {|ni| Connection.new(self, ni)}
+      raise NetworkError, "network is not ready" if @nodes.size < network_max_size * 0.9
+    end
+  end
+
+  # The node information
+  class NodeInfo
+    attr :number, :packed_key, :url
+
+    def initialize(data)
+      @data, @number, @url, @packed_key = data, data.number, data.url, data.packed_key
+      @rate = Concurrent::AtomicFixnum.new
+    end
+
+    def rate
+      @rate.value
+    end
+
+    def increment_rate
+      @rate.increment
+    end
+
+    def == other
+      # number == other.number && packed_key == other.packed_key && url == other.url
+      url == other&.url && packed_key == other&.packed_key && url == other&.url
+    end
+
+    def hash
+      @url.hash + @packed_key.hash
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    def < other
+      rate < other.rate
+    end
+  end
+
+
+  # Access to the single node using universa client protocol.
+  #
+  class Connection
+    # create connection for a given clietn. Don't call it direcly, use
+    # {Client.random_connection} or {Client.random_connections} instead. The client implements
+    # lazy initialization so time-consuming actual connection will be postponed until
+    # needed.
+    #
+    # @param [Client] client instance to be bound to
+    # @param [NodeInfo] node_info to connect to
+    def initialize(client, node_info)
+      @client, @node_info = client, node_info
+    end
+
+    # executes ping. Just to ensure connection is alive. Node answers 'sping' => 'spong' hash.
+    # 's' states that secure layer of client protocol is used, e.g. with mutual identification and
+    # ciphering.
+    def ping
+      execute(:sping)
+    end
+
+    # Execute Universa Node client protocol command with optional keyword arguments that will be passed
+    # to the node.
+    #
+    # @param [String|Symbol] name of the command
+    # @return [SmartHash] with the command result
+    def execute name, **kwargs
+      Service.umi.with_trace {
+        connection.command name.to_s, *kwargs.to_a.flatten
+      }
+    end
+
+    protected
+
+    def connection
+      @connection ||= retry_with_timeout(15, 3) {
+        Service.umi.instantiate "com.icodici.universa.node2.network.Client",
+                                @node_info.url,
+                                @client.private_key,
+                                nil,
+                                false
+      }
+    end
+
+  end
+
+end

data/lib/universa/contract.rb

@@ -12,9 +12,10 @@ module Universa
 
     # returns keys that will be used to sign this contract on next {seal}.
     # @return [Set<PrivateKey>] set of private keys
-    def signing_keys
+    def keys_to_sign_with
       get_keys_to_sign_with
     end
+
   end
 
 end

data/lib/universa/errors.rb

@@ -4,6 +4,10 @@ module Universa
   class Error < IOError
   end
 
+  # Genegal error with universa network
+  class NetworkError < Error
+  end
+
   # references from different {UMI} instances are mixed together
   class InterchangeError < Error
     # create instance optionally overriding message

data/lib/universa/umi.rb

@@ -1,5 +1,6 @@
 require 'open3'
 require 'farcall'
+require 'set'
 require 'base64'
 require 'weakref'
 require_relative 'weak_reference'
@@ -137,8 +138,9 @@ module Universa
     # These calls could be nested, on exit it restores previous trace state
     def with_trace &block
       current_state, @trace = @trace, true
-      block.call()
+      result = block.call()
       @trace = current_state
+      result
     end
 
     private

data/lib/universa/version.rb

@@ -1,4 +1,4 @@
 module Universa
   # Current gem version
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/universa.rb

@@ -6,6 +6,7 @@ require "universa/umi"
 require "universa/service"
 require "universa/keys"
 require "universa/contract"
+require "universa/client"
 
 # The Universa gem
 #

data/universa.gemspec

@@ -31,6 +31,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "farcall", ">= 0.4.6"
+  spec.add_dependency "boss-protocol", ">= 1.5.0"
+  spec.add_dependency "concurrent-ruby", ">= 1.0.5"
+  spec.add_dependency "concurrent-ruby-ext"
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - sergeych
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-03 00:00:00.000000000 Z
+date: 2018-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: farcall
@@ -24,6 +24,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.6
+- !ruby/object:Gem::Dependency
+  name: boss-protocol
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +153,7 @@ files:
 - bin/umi/lib/org.yaml.snakeyaml-1.18.jar
 - exe/universa
 - lib/universa.rb
+- lib/universa/client.rb
 - lib/universa/contract.rb
 - lib/universa/errors.rb
 - lib/universa/keys.rb