peatio 2.4.0.pre.alpha → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b90fd394ac94dbc75f0b370eae2bc13e4c86fb2a564222fa0f75ccae721cce9e
-  data.tar.gz: bc3ad24b91bb0c905d60e1fc90e5cd8de075458d14d9afb375214378b506a956
+  metadata.gz: 76e861ebc60635c251cf135769a45e86e968c4c54811c6e16fb1e73c1495f0ce
+  data.tar.gz: e549b7e2ed045691d17344d95b55be7ee862b39ee2c9e77c86bab06a55d5250c
 SHA512:
-  metadata.gz: e0d3a3cd4910ac623c3bd2befe3f6e3e525d72db15d9b8a190fe962387574290097dd46098fd9543f364b3fbda328ba404c853a132ebeb5b29843946a7f4f31c
-  data.tar.gz: c7cb647b6723e39bc3d7a124b347c0ed186a81b3882772395486efeffe0c74baa9477fb391152b6023e1c7c7496013913a550a9f4679f5e67a08518f9a517df1
+  metadata.gz: adfd9dac25a5797b7c5204ac5f262edde8e1a6647395bc8a6debf3ae68283923d84c4adf49d2b8d27ac640dcff45af6b25c2bad18827ecb82350aa3bb56747b5
+  data.tar.gz: c68562fe7a6deec16e954cbec695837861116b726ed8534c0efd7d0bf70695c89924f19702c2896d054e684a29c40144e5136ad0d588fed869bd7a766187cee3

data/.travis.yml

@@ -4,7 +4,7 @@ cache: bundler
 rvm:
 - 2.5.1
 - 2.5.3
-before_install: gem install bundler -v 1.17.1
+before_install: gem install bundler -v 1.17.3
 env:
 - WEBSOCKET_HOST: localhost
   WEBSOCKET_PORT: 8081

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    peatio (2.4.0.pre.alpha)
+    peatio (2.4.0)
       activemodel (> 5.2, <= 6.0.0)
       amqp
       bunny
       clamp
+      em-synchrony (~> 1.0)
       em-websocket
       eventmachine
+      faraday_middleware (~> 0.13.1)
+      faye (~> 1.2)
       jwt
       mysql2
       prometheus-client
@@ -24,6 +27,8 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.1, >= 2.1.8)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.0)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
@@ -37,12 +42,23 @@ GEM
     byebug (11.0.1)
     clamp (1.3.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
+    cookiejar (0.3.3)
     daemons (1.3.1)
     diff-lcs (1.3)
     docile (1.3.2)
+    em-http-request (1.1.5)
+      addressable (>= 2.3.4)
+      cookiejar (!= 0.3.1)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.2)
+      eventmachine (>= 1.0.0.beta.4)
     em-spec (0.2.7)
       eventmachine
+    em-synchrony (1.0.6)
+      eventmachine (>= 1.0.0.beta.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -50,27 +66,45 @@ GEM
       eventmachine
       websocket
     eventmachine (1.2.7)
+    faraday (0.17.3)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
+    faye (1.2.4)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      faye-websocket (>= 0.9.1)
+      multi_json (>= 1.0.0)
+      rack (>= 1.0.0)
+      websocket-driver (>= 0.5.1)
+    faye-websocket (0.10.9)
+      eventmachine (>= 0.12.0)
+      websocket-driver (>= 0.5.1)
     http_parser.rb (0.6.0)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     irb (1.0.0)
     jaro_winkler (1.5.4)
     json (2.2.0)
     jwt (2.2.1)
     method_source (0.9.2)
-    minitest (5.13.0)
-    mysql2 (0.5.2)
+    minitest (5.14.0)
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
+    mysql2 (0.5.3)
     parallel (1.19.0)
     parser (2.6.5.0)
       ast (~> 2.4.0)
-    prometheus-client (1.0.0)
+    prometheus-client (2.0.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    rack (2.0.7)
+    public_suffix (4.0.3)
+    rack (2.2.2)
     rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.9.0)
@@ -114,11 +148,14 @@ GEM
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
     websocket (1.2.8)
-    zeitwerk (2.2.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby

data/lib/peatio.rb

@@ -39,6 +39,9 @@ module Peatio
   require_relative "peatio/wallet/error"
   require_relative "peatio/wallet/registry"
 
+  require_relative "peatio/upstream/base"
+  require_relative "peatio/upstream/registry"
+
   require_relative "peatio/transaction"
   require_relative "peatio/block"
 end

data/lib/peatio/upstream/base.rb

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Peatio
+  module Upstream
+    class Base
+      DEFAULT_DELAY = 1
+      WEBSOCKET_CONNECTION_RETRY_DELAY = 2
+
+      attr_accessor :logger
+
+      def initialize(config)
+        @host = config["rest"]
+        @adapter = config[:faraday_adapter] || :em_synchrony
+        @config = config
+        @ws_status = false
+        @market = config['source']
+        @target = config['target']
+        @public_trades_cb = []
+        @logger = Peatio::Logger.logger
+        @peatio_mq = config['amqp']
+        mount
+      end
+
+      def mount
+        @public_trades_cb << method(:on_trade)
+      end
+
+      def ws_connect
+        logger.info { "Websocket connecting to #{@ws_url}" }
+        raise "websocket url missing for account #{id}" unless @ws_url
+
+        @ws = Faye::WebSocket::Client.new(@ws_url)
+
+        @ws.on(:open) do |_e|
+          subscribe_trades(@target, @ws)
+          logger.info { "Websocket connected" }
+        end
+
+        @ws.on(:message) do |msg|
+          ws_read_message(msg)
+        end
+
+        @ws.on(:close) do |e|
+          @ws = nil
+          @ws_status = false
+          logger.error "Websocket disconnected: #{e.code} Reason: #{e.reason}"
+          Fiber.new do
+            EM::Synchrony.sleep(WEBSOCKET_CONNECTION_RETRY_DELAY)
+            ws_connect
+          end.resume
+        end
+      end
+
+      def ws_connect_public
+        ws_connect
+      end
+
+      def subscribe_trades(_market, _ws)
+        method_not_implemented
+      end
+
+      def ws_read_public_message(msg)
+        logger.info { "received public message: #{msg}" }
+      end
+
+      def ws_read_message(msg)
+        logger.debug {"received websocket message: #{msg.data}" }
+
+        object = JSON.parse(msg.data)
+        ws_read_public_message(object)
+      end
+
+      def on_trade(trade)
+        logger.info { "Publishing trade event: #{trade.inspect}" }
+        @peatio_mq.enqueue_event("public", @market, "trades", {trades: [trade]})
+        @peatio_mq.publish :trade, trade_json(trade), {
+          headers: {
+            type:     :upstream,
+            market:   @market,
+          }
+        }
+      end
+
+      def trade_json(trade)
+        trade.deep_symbolize_keys!
+        {
+          id: trade[:tid],
+          price: trade[:price],
+          amount: trade[:amount],
+          market_id: @market,
+          created_at: Time.at(trade[:date]),
+          taker_type: trade[:taker_type]
+        }
+      end
+
+      def notify_public_trade(trade)
+        @public_trades_cb.each {|cb| cb&.call(trade) }
+      end
+
+      def to_s
+        "Exchange::#{self.class} config: #{@opts}"
+      end
+
+      def build_error(response)
+        JSON.parse(response.body)
+      rescue StandardError => e
+        "Code: #{response.env.status} Message: #{response.env.reason_phrase}"
+      end
+    end
+  end
+end

data/lib/peatio/upstream/registry.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Peatio
+  module Upstream
+    class << self
+      def registry
+        @registry ||= Registry.new
+      end
+
+      class Registry < Peatio::AdapterRegistry
+      end
+    end
+  end
+end

data/lib/peatio/version.rb

@@ -1,3 +1,3 @@
 module Peatio
-  VERSION = "2.4.0-alpha"
+  VERSION = "2.4.0"
 end

data/peatio.gemspec

@@ -27,8 +27,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "amqp"
   spec.add_dependency "bunny"
   spec.add_dependency "clamp"
+  spec.add_dependency "em-synchrony", "~> 1.0"
   spec.add_dependency "em-websocket"
   spec.add_dependency "eventmachine"
+  spec.add_dependency "faraday_middleware", "~> 0.13.1"
+  spec.add_dependency "faye", "~> 1.2"
   spec.add_dependency "jwt"
   spec.add_dependency "mysql2"
   spec.add_dependency "prometheus-client"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio
 version: !ruby/object:Gem::Version
-  version: 2.4.0.pre.alpha
+  version: 2.4.0
 platform: ruby
 authors:
 - Louis B.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -73,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +115,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.1
+- !ruby/object:Gem::Dependency
+  name: faye
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -389,6 +431,8 @@ files:
 - lib/peatio/sql/client.rb
 - lib/peatio/sql/schema.rb
 - lib/peatio/transaction.rb
+- lib/peatio/upstream/base.rb
+- lib/peatio/upstream/registry.rb
 - lib/peatio/version.rb
 - lib/peatio/wallet/abstract.rb
 - lib/peatio/wallet/error.rb
@@ -408,11 +452,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Peatio is a gem for running critical core services