peatio1.9 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e80cf48d4e7fdde91bdcc54415b5de89382fc3d771f4a1d10ae10593e1c209
-  data.tar.gz: 3e9328c73c580e323ad011c1c1c54f21c9d2aa5baf0a7ec4c4f933801c975188
+  metadata.gz: 9c27f83d3d8bcd476b619d1935c563452c4b7290300907326c651d4a24bcc0b0
+  data.tar.gz: 45a725ae726b661d0a787db208a03b02864c3079863ba4aa5516fa339d3cfede
 SHA512:
-  metadata.gz: 777ac8d99de880e823479b65987d689f4ebf353b79d6faab850d2e263530e4f2aeafe4cef938771743ba49ab4cde091626373a50ca4ae69eb4c9a5ba3f27c372
-  data.tar.gz: 13081c7908134089e5c5b4842fdeac92ffeed6a9c00165d38ef98239e9c5a6f47def17610342fc4cd6686fe354a5e85cb8f22cc5b9776085128be23c98e8b158
+  metadata.gz: ef2e5cea2866ffc70d4fb0498da9ba8d26ad3120f9dac860f7a8402c93d37fe4d176eee0f485a1923b73ba938636f951d70844bf284df02143f306e526a99a80
+  data.tar.gz: 76aaf1deab676935b9ebb52a81966682963497c17ea7010d8aed09ae92259fbcec94717e6e5b604162f943d826c792a1751eae023853561752ba8b63070d01c1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio1.9 (0.4.4)
+    peatio1.9 (0.4.5)
       amqp
       bunny
       clamp
@@ -40,7 +40,6 @@ GEM
     jaro_winkler (1.5.1)
     json (2.3.1)
     jwt (2.2.1)
-    mysql2 (0.5.3)
     mysql2 (0.5.3-x64-mingw32)
     parallel (1.12.1)
     parser (2.5.1.2)

data/README.md

@@ -9,7 +9,7 @@ TODO: Delete this and the text above, and describe your gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'peatio'
+gem 'peatio1.9', '0.4.4', require: 'peatio'
 ```
 
 And then execute:
@@ -18,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install peatio
+    $ gem install peatio1.9
 
 ## Usage
 

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
 

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,21 +12,36 @@ module Peatio::Ranger
       @socket.send payload
     end
 
-    def handle(msg)
-      authorized = false
-      begin
-        data = JSON.parse(msg)
+    def update_streams
+      @socket.instance_variable_set(:@connection_handler, @client)
+    end
 
-        token = data["jwt"]
+    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
 
-        payload = @authenticator.authenticate!(token)
+    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 authenticate(jwt)
+      begin
+        token = data["jwt"]
+        payload = @authenticator.authenticate!(token)
         authorized = true
-      rescue JSON::ParserError
       rescue => error
         @logger.error error.message
       end
-
       if !authorized
         send :error, message: "Authentication failed."
         return
@@ -36,27 +50,50 @@ module Peatio::Ranger
       @client.user = payload[:uid]
       @client.authorized = true
 
-      @logger.info "ranger: user #{@client.user} authenticated #{@streams}"
-
+      @logger.info "ranger: user #{@client.user} authenticated"
       send :success, message: "Authenticated."
+
     end
 
-    def handshake(handshake)
-      query = URI::decode_www_form(handshake.query_string)
+    def handle(msg)
+      authorized = false
+      begin
+        data = JSON.parse(msg)
+
+        case data["event"]
+        when "subscribe"
+          subscribe data["streams"]
+        when "unsubscribe"
+          unsubscribe data["streams"]
+        when "jwt"
+          authenticate data["jwt"]
 
-      @streams = query.map do |item|
-        if item.first == "stream"
-          item.last
         end
+      rescue JSON::ParserError
+      rescue => error
+        @logger.error error.message
       end
+    end
 
-      @logger.info "ranger: WebSocket connection openned, streams: #{@streams}"
-
-      @client = Peatio::MQ::Events::Client.new(
-        @socket, @streams,
-      )
-
-      @socket.instance_variable_set(:@connection_handler, @client)
+    def handshake(hs)
+      @client = Peatio::MQ::Events::Client.new(@socket)
+      query = URI::decode_www_form(hs.query_string)
+      subscribe(query.map {|item| item.last if item.first == "stream"})
+      @logger.info "ranger: WebSocket connection openned"
+
+      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
 
@@ -91,6 +128,10 @@ module Peatio::Ranger
           connection.handle(msg)
         end
 
+        socket.onping do |value|
+          logger.info "Received ping: #{value}"
+        end
+
         socket.onclose do
           logger.info "ranger: WebSocket connection closed"
         end

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: peatio1.9
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - topdev