bitcoinrb-grpc 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 789a4d81089796944c4dc9b383516eb33068e21028531e371f3b79ec318ea7a3
-  data.tar.gz: 91d513d7059a580d1f37a6467097992c0b4ae7ccff8864081e2fbe13edfa4ea6
+  metadata.gz: 2f7e6f764cbbfd51ed4f6a98ff9f0466bed57257420683babbc400ca0cac4c79
+  data.tar.gz: 2e34dfe009279d0b0e75aa38fa8de9541990280438671010c4aee78e8d117709
 SHA512:
-  metadata.gz: 3e05de2b0249fe8eadbf253b25a90c20a1c0bc18524aacf9dde5aa5c81f8dee9f100328c1a6b5899f3f71c2b0e4766b273783d4bf7a163e01fc0af475f269896
-  data.tar.gz: 7acbeb19cef64a31549ece381a031e556cb2b9ca37dca88e202a0e4a47afad7483ee2007dc3275ab7bd52d7cc9a516d59a350f560e6a01aa066ec8ac3a6e6e59
+  metadata.gz: 21ca38a506f519362795143e2a455a0107c11fca9d6ec7f1755f9ad346da6edd311716bc642af0ff0a1a44f685474edb560d3e58eec5dd2d343ee3a316a6fb0e
+  data.tar.gz: 9531c54501014015b9c2cacf59bd87bf19d796697791a3e930fa0ae13c86f43f4873f8e9c118aa953ef1bd36225554710661f21e202088c0b0d237bb2b61a701

data/config.yml

@@ -0,0 +1,4 @@
+open_assets_explorer:
+  url: http://localhost:3000/tx/
+  #url: https://www.oaexplorer.com/tx/ # mainnet
+  #url: http://localhost:3000/tx/ # testnet

data/lib/bitcoin/grpc/oap_service.rb

@@ -14,15 +14,17 @@ module Bitcoin
       end
 
       def self.oae_url
-        case
-        when Bitcoin.chain_params.mainnet?
-          'https://www.oaexplorer.com/tx/'
-        when Bitcoin.chain_params.testnet?
-          'https://testnet.oaexplorer.com/tx/'
-        when Bitcoin.chain_params.regtest?
-          'http://localhost:9292/tx/'
-        end
+        @@config ||= load_config
+        @@config['url']
+      end
+
+      def self.load_config
+        file = 'config.yml'
+        yml = YAML.load_file(file)
+        config = yml['open_assets_explorer']
+        raise "config.yml should contain 'open_assets_explorer' section." unless config
+        config
       end
     end
   end
-end
+end

data/lib/bitcoin/grpc/server.rb

@@ -22,10 +22,10 @@ module Bitcoin
       def watch_tx_confirmed(request, call)
         logger.info("watch_tx_confirmed: #{request}")
         utxo_handler << request
-        channel = Concurrent::Channel.new(capacity: 100)
-        Receiver.spawn(:receiver, channel, request, publisher, [Bitcoin::Grpc::EventTxConfirmed])
-        ResponseEnum.new(request, channel, WatchTxConfirmedResponseBuilder).each
+        response = []
+        Receiver.spawn(:receiver, request, response, publisher, [Bitcoin::Grpc::EventTxConfirmed])
         logger.info("watch_tx_confirmed: end")
+        ResponseEnum.new(request, response, WatchTxConfirmedResponseBuilder).each
       rescue => e
         logger.info("watch_tx_confirmed: #{e.message}")
         logger.info("watch_tx_confirmed: #{e.backtrace}")
@@ -34,10 +34,10 @@ module Bitcoin
       def watch_utxo(request, call)
         logger.info("watch_utxo: #{request}")
         utxo_handler << request
-        channel = Concurrent::Channel.new(capacity: 100)
-        Receiver.spawn(:receiver, channel, request, publisher, [Bitcoin::Grpc::EventUtxoRegistered, Bitcoin::Grpc::EventUtxoSpent])
-        ResponseEnum.new(request, channel, WatchUtxoResponseBuilder).each
+        response = []
+        Receiver.spawn(:receiver, request, response, publisher, [Bitcoin::Grpc::EventUtxoRegistered, Bitcoin::Grpc::EventUtxoSpent])
         logger.info("watch_utxo: end")
+        ResponseEnum.new(request, response, WatchUtxoResponseBuilder).each
       rescue => e
         logger.info("watch_utxo: #{e.message}")
         logger.info("watch_utxo: #{e.backtrace}")
@@ -46,10 +46,10 @@ module Bitcoin
       def watch_token(request, call)
         logger.info("watch_token: #{request}")
         utxo_handler << request
-        channel = Concurrent::Channel.new(capacity: 100)
-        Receiver.spawn(:receiver, channel, request, publisher, [Bitcoin::Grpc::EventTokenIssued, Bitcoin::Grpc::EventTokenTransfered])
-        ResponseEnum.new(request, channel, WatchTokenResponseBuilder).each
+        response = []
+        Receiver.spawn(:receiver, request, response, publisher, [Bitcoin::Grpc::EventTokenIssued, Bitcoin::Grpc::EventTokenTransfered])
         logger.info("watch_token: end")
+        ResponseEnum.new(request, response, WatchTokenResponseBuilder).each
       rescue => e
         logger.info("watch_token: #{e.message}")
         logger.info("watch_token: #{e.backtrace}")
@@ -92,39 +92,40 @@ module Bitcoin
     class Receiver < Concurrent::Actor::Context
       include Concurrent::Concern::Logging
 
-      attr_reader :channel, :request
+      attr_reader :request, :response
 
-      def initialize(channel, request, publisher, classes)
-        @channel = channel
+      def initialize(request, response, publisher, classes)
         @request = request
+        @response = response
         classes.each {|c| publisher << [:subscribe, c] }
       end
       def on_message(message)
-        log(::Logger::DEBUG, "Receiver#on_message:#{message}")
         if request.id == message.request_id
           log(::Logger::DEBUG, "Receiver#on_message:#{message}")
-          channel << message
+          response << message
         end
       end
     end
 
     class ResponseEnum
-      attr_reader :req, :channel, :wrapper_classs, :logger
+      attr_reader :req, :response, :wrapper_classs, :logger
 
-      def initialize(req, channel, wrapper_classs)
+      def initialize(req, response, wrapper_classs)
         @req = req
-        @channel = channel
+        @response = response
         @wrapper_classs = wrapper_classs
         @logger = Bitcoin::Logger.create(:debug)
       end
 
       def each
-        logger.info("ResponseEnum#each")
         return enum_for(:each) unless block_given?
         loop do
-          event = channel.take
-          channel.close
-          yield wrapper_classs.build(event.request_id, event)
+          event = response.first
+          if event
+            yield wrapper_classs.build(event.request_id, event)
+          else
+            sleep(1)
+          end
         end
       end
     end

data/lib/bitcoin/grpc/version.rb

@@ -1,5 +1,5 @@
 module Bitcoin
   module Grpc
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb-grpc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - bin/console
 - bin/setup
 - bitcoinrb-grpc.gemspec
+- config.yml
 - lib/bitcoin/grpc.rb
 - lib/bitcoin/grpc/grpc_pb.rb
 - lib/bitcoin/grpc/grpc_services_pb.rb