peatio 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544f2e08a61c0d131a56d773a10f5ca00cc3f48fed002b29d03f12f74cb14408
-  data.tar.gz: bc924762a87b68999d9f69ffbbfb2244e9e27d93a009f90a3aa1fedc938a8390
+  metadata.gz: 8cc7f7dae49e5e34e71138ae6f7c5097516309d421fe9a048d3fffc5aa4c4081
+  data.tar.gz: 209f063cd346d27742b57a12a991904cd7c9c320154aab9fb7d50eb9ce45d736
 SHA512:
-  metadata.gz: e09bbcd7320c24252e9538b2b89afa1cc52b4b6926eb0ce9889177cba0459d9b89d0183e8b93cac3e7768cb03b24ac32a7cba43b0c771a8e71a6c655835f66c9
-  data.tar.gz: 0116a1991d8b7db0d1570ca0bb8a2a7849c701380f31d0ceb131ece9287572cfad6b8fb0892782dbe5ae2b39d512ae766d7a5c6eea189ee16f25a713c668163e
+  metadata.gz: 9b85df8a9f919dadc29dfaff264555cfecefd1b5477e0161ccf517f1370c1a7a4e6f7b663cdc7b8982b70f937c85bf522f94b887ce30d5ec86710385814f2f37
+  data.tar.gz: 0b2081360b0f23ca898dbef3e0a0d3327f9355ff0e2e5de3c45fb45d30ff0da7fc30d6d2885abbe74210cf87b619578b0dccc1606c4f218bad772882df9cd197

data/.travis.yml

@@ -2,6 +2,7 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
+- 2.5.1
 - 2.5.3
 before_install: gem install bundler -v 1.17.1
 env:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio (0.4.4)
+    peatio (0.4.5)
       amqp
       bunny
       clamp
@@ -19,8 +19,8 @@ GEM
       eventmachine
     ast (2.4.0)
     bump (0.6.1)
-    bunny (2.12.0)
-      amq-protocol (~> 2.3, >= 2.3.0)
+    bunny (2.11.0)
+      amq-protocol (~> 2.3.0)
     bunny-mock (1.7.0)
       bunny (>= 1.7)
     clamp (1.3.0)
@@ -52,7 +52,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -61,16 +61,16 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.60.0)
+    rubocop (0.58.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-github (0.12.0)
-      rubocop (~> 0.59)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-github (0.10.0)
+      rubocop (~> 0.51)
     ruby-progressbar (1.10.0)
     simplecov (0.16.1)
       docile (~> 1.1)
@@ -101,4 +101,4 @@ DEPENDENCIES
   simplecov-json
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/peatio/auth/jwt_authenticator.rb

@@ -121,7 +121,7 @@ module Peatio::Auth
 
       payload
     rescue JWT::DecodeError => e
-      raise(Peatio::Auth::Error, "Failed to decode and verify JWT")
+      raise(Peatio::Auth::Error, "Failed to decode and verify JWT: #{e.message}")
     end
   end
 end

data/lib/peatio/injectors/peatio_events.rb

@@ -1,11 +1,14 @@
 module Peatio::Injectors
   class PeatioEvents
-    attr_accessor :market, :seller_uid, :buyer_uid, :logger
+    attr_accessor :market, :market_name, :base_unit, :quote_unit, :seller_uid, :buyer_uid, :logger
 
     def run!
       require "time"
       @logger = Peatio::Logger.logger
       @market = "eurusd"
+      @market_name = "EUR/USD"
+      @base_unit = "eur"
+      @quote_unit = "usd"
       @seller_uid = 21
       @buyer_uid = 42
       @messages = create_messages
@@ -32,12 +35,12 @@ module Peatio::Injectors
 
     def create_messages
       [
-        private_trade,
-        order_created,
-        order_canceled,
-        order_completed,
-        order_updated,
-        trade_completed,
+        public_tickers,
+        public_orderbook,
+        private_order,
+        private_trade_user1,
+        private_trade_user2,
+        public_trade,
       ]
     end
 
@@ -52,158 +55,122 @@ module Peatio::Injectors
     alias :completed_at :updated_at
     alias :canceled_at :updated_at
 
-    def private_trade
+    def public_orderbook
       [
-        "private",
-        "debug_user",
-        "trade",
+        "public",
+        market,
+        "update",
         {
-          trade: "some-data",
-        },
+          "asks": [
+            ["1020.0","0.005"],
+            ["1026.0","0.03"]
+          ],
+          "bids": [
+            ["1000.0","0.25"],
+            ["999.0","0.005"],
+            ["994.0","0.005"],
+            ["1.0","11.0"]
+          ]
+        }
       ]
     end
 
-    def order_created
+    def public_tickers
       [
         "public",
-        market,
-        "order_created",
+        "global",
+        "tickers",
         {
-          market: "#{market}",
-          type: "buy",
-          trader_uid: buyer_uid,
-          income_unit: "btc",
-          income_fee_type: "relative",
-          income_fee_value: "0.0015",
-          outcome_unit: "usd",
-          outcome_fee_type: "relative",
-          outcome_fee_value: "0.0",
-          initial_income_amount: "14.0",
-          current_income_amount: "14.0",
-          initial_outcome_amount: "0.42",
-          current_outcome_amount: "0.42",
-          strategy: "limit",
-          price: "0.03",
-          state: "open",
-          trades_count: 0,
-          created_at: created_at.iso8601,
-        },
+          market => {
+            "name": market_name,
+            "base_unit": base_unit,
+            "quote_unit": quote_unit,
+            "low": "1000.0",
+            "high": "10000.0",
+            "last": "1000.0",
+            "open": 1000.0,
+            "volume": "0.0",
+            "sell": "1020.0",
+            "buy": "1000.0",
+            "at": Time.now.to_i
+            }
+          }
       ]
     end
 
-    def order_canceled
+    def private_order
       [
-        "public",
-        market,
-        "order_canceled",
+        "private",
+        "IDABC0000001",
+        "order",
         {
-          market: "#{market}",
-          type: "sell",
-          trader_uid: seller_uid,
-          income_unit: "usd",
-          income_fee_type: "relative",
-          income_fee_value: "0.0015",
-          outcome_unit: "btc",
-          outcome_fee_type: "relative",
-          outcome_fee_value: "0.0",
-          initial_income_amount: "3.0",
-          current_income_amount: "3.0",
-          initial_outcome_amount: "100.0",
-          current_outcome_amount: "100.0",
-          strategy: "limit",
-          price: "0.03",
-          state: "canceled",
-          trades_count: 0,
-          created_at: created_at.iso8601,
-          canceled_at: canceled_at.iso8601,
-        },
+          "id": 22,
+          "at": created_at.to_i,
+          "market": market,
+          "kind":"bid",
+          "price":"1026.0",
+          "state":"wait",
+          "volume":"0.001",
+          "origin_volume":"0.001"
+        }
       ]
     end
 
-    def order_completed
+    def private_trade_user1
       [
-        "public",
-        market,
-        "order_completed", {
-          market: "#{market}",
-          type: "sell",
-          trader_uid: seller_uid,
-          income_unit: "usd",
-          income_fee_type: "relative",
-          income_fee_value: "0.0015",
-          outcome_unit: "btc",
-          outcome_fee_type: "relative",
-          outcome_fee_value: "0.0",
-          initial_income_amount: "3.0",
-          current_income_amount: "0.0",
-          previous_income_amount: "3.0",
-          initial_outcome_amount: "100.0",
-          current_outcome_amount: "0.0",
-          previous_outcome_amount: "100.0",
-          strategy: "limit",
-          price: "0.03",
-          state: "completed",
-          trades_count: 1,
-          created_at: created_at.iso8601,
-          completed_at: completed_at.iso8601,
-        },
+        "private",
+        "IDABC0000001",
+        "trade",
+        {
+          "id": 7,
+          "kind": "ask",
+          "at": created_at.to_i,
+          "price": "1020.0",
+          "volume": "0.001",
+          "ask_id": 15,
+          "bid_id": 22,
+          "market": market
+        }
       ]
     end
 
-    def order_updated
+    def private_trade_user2
       [
-        "public",
-        market,
-        "order_updated", {
-          market: "#{market}",
-          type: "sell",
-          trader_uid: seller_uid,
-          income_unit: "usd",
-          income_fee_type: "relative",
-          income_fee_value: "0.0015",
-          outcome_unit: "btc",
-          outcome_fee_type: "relative",
-          outcome_fee_value: "0.0",
-          initial_income_amount: "3.0",
-          current_income_amount: "2.4",
-          previous_income_amount: "3.0",
-          initial_outcome_amount: "100.0",
-          current_outcome_amount: "80.0",
-          previous_outcome_amount: "100.0",
-          strategy: "limit",
-          price: "0.03",
-          state: "open",
-          trades_count: 1,
-          created_at: created_at.iso8601,
-          updated_at: updated_at.iso8601,
-        },
+        "private",
+        "IDABC0000002",
+        "trade",
+        {
+          "id": 7,
+          "kind": "bid",
+          "at": created_at.to_i,
+          "price": "1020.0",
+          "volume": "0.001",
+          "ask_id": 15,
+          "bid_id": 22,
+          "market": market
+        }
       ]
     end
 
-    def trade_completed
+    def public_trade
       [
         "public",
         market,
-        "trade_completed", {
-          market: "#{market}",
-          price: "0.03",
-          buyer_uid: buyer_uid,
-          buyer_income_unit: "btc",
-          buyer_income_amount: "14.0",
-          buyer_income_fee: "0.021",
-          buyer_outcome_unit: "usd",
-          buyer_outcome_amount: "0.42",
-          buyer_outcome_fee: "0.0",
-          seller_uid: seller_uid,
-          seller_income_unit: "usd",
-          seller_income_amount: "0.42",
-          seller_income_fee: "0.00063",
-          seller_outcome_unit: "btc",
-          seller_outcome_amount: "14.0",
-          seller_outcome_fee: "0.0",
-          completed_at: completed_at.iso8601,
-        },
+        "trades",
+        {
+          "trades": [
+            {
+              "tid": 7,
+              "type": "buy",
+              "date": created_at.to_i,
+              "price": "1020.0",
+              "amount":
+              "0.001"
+            }
+          ]
+        }
       ]
     end
+
   end
 end

data/lib/peatio/mq/events.rb

@@ -35,7 +35,7 @@ module Peatio::MQ::Events
       end
     end
 
-    def initialize(socket, streams)
+    def initialize(socket, streams = {})
       @socket = socket
       @streams = streams
 
@@ -108,7 +108,7 @@ module Peatio::MQ::Events
         if type == "private"
           Client.user(id) do |client|
             if client.streams.include?(event)
-              client.send_payload [event, payload_decoded]
+              client.send_payload(event => payload_decoded)
             end
           end
 
@@ -119,7 +119,7 @@ module Peatio::MQ::Events
 
         Client.all.each do |handler|
           if handler.streams.include?(id) or handler.streams.include?(stream)
-            handler.send_payload [stream, payload_decoded]
+            handler.send_payload(stream => payload_decoded)
           end
         end
       end

data/lib/peatio/ranger.rb

@@ -4,7 +4,6 @@ module Peatio::Ranger
       @authenticator = authenticator
       @socket = socket
       @logger = logger
-      @streams = []
     end
 
     def send(method, data)
@@ -13,50 +12,76 @@ module Peatio::Ranger
       @socket.send payload
     end
 
-    def handle(msg)
+    def authenticate(jwt)
+      payload = {}
       authorized = false
       begin
-        data = JSON.parse(msg)
-
-        token = data["jwt"]
-
-        payload = @authenticator.authenticate!(token)
-
+        payload = @authenticator.authenticate!(jwt)
         authorized = true
-      rescue JSON::ParserError
-      rescue => error
+      rescue Peatio::Auth::Error => error
         @logger.error error.message
       end
+      return [authorized, payload]
+    end
 
-      if !authorized
-        send :error, message: "Authentication failed."
-        return
-      end
-
-      @client.user = payload[:uid]
-      @client.authorized = true
+    def update_streams
+      @socket.instance_variable_set(:@connection_handler, @client)
+    end
 
-      @logger.info "ranger: user #{@client.user} authenticated #{@streams}"
+    def subscribe(streams)
+      raise "Streams must be an array of strings" unless streams.is_a?(Array)
+      streams.each do |stream|
+        next if stream.nil?
+        @client.streams[stream] = true
+      end
+      send :success, message: "subscribed", streams: @client.streams.keys
+    end
 
-      send :success, message: "Authenticated."
+    def unsubscribe(streams)
+      raise "Streams must be an array of strings" unless streams.is_a?(Array)
+      streams.each do |stream|
+        next if stream.nil?
+        @client.streams.delete(stream)
+      end
+      send :success, message: "unsubscribed", streams: @client.streams.keys
     end
 
-    def handshake(handshake)
-      query = URI::decode_www_form(handshake.query_string)
+    def handle(msg)
+      begin
+        data = JSON.parse(msg)
 
-      @streams = query.map do |item|
-        if item.first == "stream"
-          item.last
+        case data["event"]
+        when "subscribe"
+          subscribe data["streams"]
+        when "unsubscribe"
+          unsubscribe data["streams"]
         end
+
+      rescue JSON::ParserError => error
+        @logger.debug { "#{error}, msg: `#{msg}`" }
       end
+    end
 
-      @logger.info "ranger: WebSocket connection openned, streams: #{@streams}"
+    def handshake(hs)
+      @client = Peatio::MQ::Events::Client.new(@socket)
 
-      @client = Peatio::MQ::Events::Client.new(
-        @socket, @streams,
-      )
+      query = URI::decode_www_form(hs.query_string)
+      subscribe(query.map {|item| item.last if item.first == "stream"})
+      @logger.info "ranger: WebSocket connection openned"
 
-      @socket.instance_variable_set(:@connection_handler, @client)
+      if hs.headers_downcased.key?("authorization")
+        authorized, payload = authenticate(hs.headers["authorization"])
+
+        if !authorized
+          @logger.info "ranger: #{@client.user} authentication failed"
+          raise EM::WebSocket::HandshakeError, "Authorization failed"
+        else
+          @logger.info [authorized, payload].inspect
+          @client.user = payload[:uid]
+          @client.authorized = true
+          @logger.info "ranger: user #{@client.user} authenticated #{@client.streams}"
+        end
+      end
     end
   end
 
@@ -79,20 +104,24 @@ module Peatio::Ranger
       EM::WebSocket.start(
         host: host,
         port: port,
-        secure: false,
+        secure: false
       ) do |socket|
         connection = Connection.new(authenticator, socket, logger)
 
-        socket.onopen do |handshake|
-          connection.handshake(handshake)
+        socket.onopen do |hs|
+          connection.handshake(hs)
         end
 
         socket.onmessage do |msg|
           connection.handle(msg)
         end
 
+        socket.onping do |value|
+          logger.info "Received ping: #{value}"
+        end
+
         socket.onclose do
-          logger.info "ranger: WebSocket connection closed"
+          logger.info "ranger: websocket connection closed"
         end
 
         socket.onerror do |e|

data/lib/peatio/version.rb

@@ -1,3 +1,3 @@
 module Peatio
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peatio
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Louis B.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp