substrate_client.rb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0802284ca7abb1fd02f502506a00ba67ef2c0d436a1bede7012fc7746196c9
-  data.tar.gz: 2b76f455d30a57c0b36eceecc5cf19e720126e9f071e3899b054a151bb1b122c
+  metadata.gz: 6ffef7ed87e2488047c796e8a77cc3e0789f532891a69283f6339b9dc55e899d
+  data.tar.gz: '08806295aaf4ced6714042496be2a54408fc4c1ba8d5bebbfe352b431407ec02'
 SHA512:
-  metadata.gz: 392f72952f9822de5dff8b6c5df89b7eab52e7bdf38c988f0ea4448c8f6439f74dd06e415dd1fc33c627ed4c74e494c8838c452d3975e1f92c89a8b86e4e68a9
-  data.tar.gz: eda7bacb9cb728d254c3582ef99696689fe03d387b14ad38ad4196b1c4a2ed10eb3f806a8c01c1da9c9143ffe00a15e1597b534c2df9ac1876d62fd63a1be230
+  metadata.gz: ede3bdec9f513b5586f8d9404c2f55e8ab70d53cb70e8f87920da8ecaab5f605542bf1f5fef4137d267088f11591abf1b1624530f9e97f01d779c60015c876ff
+  data.tar.gz: 967fa99d7887a30bade8a3914cfed8496a0a821f9ffc101405608b941fb406418fcacbd95be499ed6cd28960b0eadc9b1c98e733828783814e58f5ea44b18336

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    substrate_client.rb (0.1.4)
+    substrate_client.rb (0.1.5)
       activesupport (~> 5.2.4)
       eventmachine (~> 1.2.7)
       faye-websocket (~> 0.10.9)
@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -28,7 +28,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.3.0)
     method_source (0.9.2)
-    minitest (5.14.0)
+    minitest (5.14.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/lib/substrate_client.rb

@@ -1,29 +1,41 @@
 require "substrate_client/version"
 
+require "logger"
 require "scale.rb"
-require "faye/websocket"
-require "eventmachine"
 require "json"
 require "active_support"
 require "active_support/core_ext/string"
+require "websocket"
+require "timeout_queue"
 
 class SubstrateClient
   class RpcError < StandardError; end
+  class RpcTimeout < StandardError; end
+  class << self
+    attr_accessor :logger
+  end
+  SubstrateClient.logger = Logger.new(STDOUT)
+  SubstrateClient.logger.level = Logger::INFO
 
   attr_accessor :spec_name, :spec_version, :metadata
-  attr_reader :ws
+  attr_accessor :ws
 
-  def initialize(url: , spec_name: nil)
+  def initialize(url, spec_name: nil, onopen: nil)
     @url = url
     @request_id = 1
     @spec_name = spec_name
+    @onopen = onopen
     Scale::TypeRegistry.instance.load(spec_name)
 
     init_ws
   end
 
+  def close
+    @ws.close
+  end
+
   def request(method, params, subscription_callback=nil)
-    queue = Queue.new
+    queue = TimeoutQueue.new
 
     payload = {
       "jsonrpc" => "2.0",
@@ -35,7 +47,7 @@ class SubstrateClient
     @callbacks[@request_id] = proc { |data| queue << data }
     @ws.send(payload.to_json)
     @request_id += 1
-    data = queue.pop
+    data = queue.pop(true, 5)
 
     if not subscription_callback.nil? && data["result"]
       @subscription_callbacks[data["result"]] = subscription_callback
@@ -46,6 +58,8 @@ class SubstrateClient
     else
       data["result"]
     end
+  rescue ThreadError => ex
+    raise RpcTimeout
   end
 
   def init_runtime(block_hash: nil, block_id: nil)
@@ -232,13 +246,13 @@ class SubstrateClient
           begin
             callback.call result
           rescue => ex
-            puts ex.message
-            puts ex.backtrace.join("\n")
+            SubstrateClient.logger.error ex.message
+            SubstrateClient.logger.error ex.backtrace.join("\n")
           end
         },
 
         proc { |e|
-          puts e
+          SubstrateClient.logger.error e
         }
 
       )
@@ -289,7 +303,13 @@ class SubstrateClient
       hasher2,
       metadata.value.value[:metadata][:version]
     )
-
+  
+    p module_name
+    p storage_name
+    p params
+    p hasher
+    p hasher2
+    p metadata.value.value[:metadata][:version]
     result = self.state_get_storage(storage_hash, block_hash)
     return unless result
     Scale::Types.get(return_type).decode(Scale::Bytes.new(result))
@@ -367,55 +387,36 @@ class SubstrateClient
 
   private
   def init_ws
-    queue = Queue.new
-
-    Thread.new do
-      EM.run do
-        start_connection
-        queue << "ok"
-      end
-    end
-
-    if queue.pop
-      Thread.new do
-        loop do
-          if @ws && @ws.ready_state == 3
-            puts "try to reconnect"
-            start_connection
-          end
-
-          sleep(3)
-        end
-      end
-    end
-  end
+    @ws = Websocket.new(@url,
 
-  def start_connection
-    @callbacks = {}
-    @subscription_callbacks = {}
+      onopen: proc do |event|
+        @callbacks = {}
+        @subscription_callbacks = {}
+        @onopen.call event if not @onopen.nil?
+      end,
 
-    @ws = Faye::WebSocket::Client.new(@url)
-    @ws.on :message do |event|
-      # p [:message, event.data]
-      if event.data.include?("jsonrpc")
-        begin
-          data = JSON.parse event.data
-
-          if data["params"]
-            if @subscription_callbacks[data["params"]["subscription"]]
-              @subscription_callbacks[data["params"]["subscription"]].call data
+      onmessage: proc do |event| 
+        if event.data.include?("jsonrpc")
+          begin
+            data = JSON.parse event.data
+
+            if data["params"]
+              if @subscription_callbacks[data["params"]["subscription"]]
+                @subscription_callbacks[data["params"]["subscription"]].call data
+              end
+            else
+              @callbacks[data["id"]].call data
+              @callbacks.delete(data["id"])
             end
-          else
-            @callbacks[data["id"]].call data
-            @callbacks.delete(data["id"])
-          end
 
-        rescue => ex
-          puts ex.message
-          puts ex.backtrace.join("\n")
+          rescue => ex
+            SubstrateClient.logger.error ex.message
+            SubstrateClient.logger.error ex.backtrace.join("\n")
+          end
         end
       end
-    end
+
+    )
   end
 
 end

data/lib/substrate_client/version.rb

@@ -1,3 +1,3 @@
 class SubstrateClient
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/timeout_queue.rb

@@ -0,0 +1,34 @@
+# https://vaneyckt.io/posts/ruby_concurrency_building_a_timeout_queue/
+class TimeoutQueue
+  def initialize
+    @elems = []
+    @mutex = Mutex.new
+    @cond_var = ConditionVariable.new
+  end
+
+  def <<(elem)
+    @mutex.synchronize do
+      @elems << elem
+      @cond_var.signal
+    end
+  end
+
+  def pop(blocking = true, timeout = nil)
+    @mutex.synchronize do
+      if blocking
+        if timeout.nil?
+          while @elems.empty?
+            @cond_var.wait(@mutex)
+          end
+        else
+          timeout_time = Time.now.to_f + timeout
+          while @elems.empty? && (remaining_time = timeout_time - Time.now.to_f) > 0
+            @cond_var.wait(@mutex, remaining_time)
+          end
+        end
+      end
+      raise ThreadError, 'queue empty' if @elems.empty?
+      @elems.shift
+    end
+  end
+end

data/lib/websocket.rb

@@ -0,0 +1,79 @@
+require "faye/websocket"
+require "eventmachine"
+
+class SubstrateClient::Websocket
+  HEARTBEAT_INTERVAL = 3
+  RECONNECT_INTERVAL = 3
+
+  def initialize(url, onopen: nil, onmessage: nil)
+    @url = url
+    @onopen = onopen || proc { p [:open] }
+    @onmessage = onmessage || proc { |event| p [:message, event.data] }
+
+    @thread = Thread.new do
+      EM.run do
+        start_connection
+      end
+      SubstrateClient.logger.info "Event loop stopped"
+    end
+    @heartbeat_thread = start_heartbeat
+  end
+
+  def start_connection
+    SubstrateClient.logger.info "Start to connect"
+    @close = false
+    @missed_heartbeats = 0
+    @ping_id = 0
+    @ws = Faye::WebSocket::Client.new(@url)
+    @ws.on :open do |event|
+      @do_heartbeat = true
+      @onopen.call event
+    end
+
+    @ws.on :message do |event|
+      @onmessage.call event
+    end
+
+    @ws.on :close do |event|
+      # p [:close, event.code, event.reason]
+      if @close == false
+        @do_heartbeat = false
+        sleep RECONNECT_INTERVAL
+        start_connection
+      end
+    end
+
+  end
+
+  def start_heartbeat
+    Thread.new do
+      loop do
+        send_heartbeat if @do_heartbeat
+        sleep HEARTBEAT_INTERVAL
+      end
+    end
+  end
+
+  def send_heartbeat
+    if @missed_heartbeats < 2
+      # puts "ping_#{@ping_id}"
+      @ws.ping @ping_id.to_s do
+        # puts "pong"
+        @missed_heartbeats -= 1
+      end
+      @missed_heartbeats += 1
+      @ping_id += 1
+    end
+  end
+
+  def send(message)
+    @ws.send message
+  end
+
+  def close
+    @close = true
+    Thread.kill @heartbeat_thread
+    Thread.kill @thread
+    @ws = nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: substrate_client.rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Wu Minzhe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye-websocket
@@ -144,6 +144,8 @@ files:
 - exe/metadata
 - lib/substrate_client.rb
 - lib/substrate_client/version.rb
+- lib/timeout_queue.rb
+- lib/websocket.rb
 - substrate_client.gemspec
 homepage: https://github.com/itering/substrate_client.rb
 licenses: