deribit-api 0.1.3 → 2.0.2

data/lib/deribit/http.rb

@@ -1,32 +1,33 @@
 module Deribit
-  # HTTP API
+  # HTTP API adapter
+  # @author Iulian Costan (deribit-api@iuliancostan.com)
   # @see https://docs.deribit.com/api-http.html
   class Http
-    def initialize(host, key: nil, secret: nil, debug: false)
-      url = 'https://' + host
-      @connection = Faraday::Connection.new(url: url) do |f|
+    def initialize(host, key: nil, secret: nil, debug: false, raise_error: true)
+      @connection = Faraday::Connection.new(url: http_url(host)) do |f|
         f.request :json
+        f.use Deribit::Authentication, key, secret
         f.response :mashify
         f.response :json
-        f.use Deribit::Authentication, key, secret
-        f.response :logger if debug
+        f.use Faraday::Response::RaiseError if raise_error
+        f.response :detailed_logger if debug
         f.adapter Faraday.default_adapter
       end
     end
 
-    def get(action, params: {}, raw_body: false, auth: false)
-      response = @connection.get path(action, auth), params
+    def get(uri, params = {})
+      response = @connection.get path(uri), params
 
       # TODO: move to middleware
-      raise response.message unless response.success?
-      raise response.body.message unless response.body.success
+      # raise response.error unless response.error
+      # raise response.body.message unless response.body.success
 
       body = response.body
-      raw_body ? body : body.result
+      body.result
     end
 
-    def post(action, params)
-      response = @connection.post path(action, true), params
+    def post(uri, params)
+      response = @connection.post path(uri), params
 
       # TODO: move to middleware
       raise response.message unless response.success?
@@ -37,9 +38,15 @@ module Deribit
 
     private
 
-    def path(action, auth = false)
-      access = auth ? 'private' : 'public'
-      "/api/v1/#{access}/#{action}"
+    def path(uri)
+      path = '/api/v2'
+      path += '/' unless uri.start_with? '/'
+      path += uri
+      path
+    end
+
+    def http_url(host)
+      'https://' + host
     end
   end
 end

data/lib/deribit/naming.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Deribit
+  # @author Iulian Costan (deribit-api@iuliancostan.com)
+  module Naming
+    def trades_channel(options)
+      private = options.delete :private
+      trades = private ? 'user.trades' : 'trades'
+      channel trades, options
+    end
+
+    def trades_uri(options)
+      private = options.delete :private
+      uri = private ? 'private/get_user_trades' : 'public/get_last_trades'
+      uri += by_instrument(options) + by_currency(options)
+      uri += options[:end_timestamp] ? '_and_time' : ''
+      uri
+    end
+
+    def book_channel(options)
+      'book' + for_instrument(options) + with_group_and_depth(options) + with_interval(options)
+    end
+
+    def channel(prefix, options)
+      channel = prefix
+      channel += for_instrument(options) if options[:instrument_name]
+      channel += for_currency(options) if options[:currency]
+      channel += with_interval(options)
+      channel
+    end
+
+    def channel_for_instrument(prefix, options)
+      prefix + for_instrument(options)
+    end
+
+    def instrument_with_interval(prefix, options)
+      prefix + for_instrument(options) + with_interval(options)
+    end
+
+    def cancel_uri(options)
+      '/private/cancel_all' + by_instrument(options) + by_currency(options)
+    end
+
+    def orders_uri(options)
+      '/private/get_open_orders' + by_instrument(options) + by_currency(options)
+    end
+
+    def by_instrument(options)
+      options[:instrument_name] ? '_by_instrument' : ''
+    end
+
+    def by_currency(options)
+      options[:currency] ? '_by_currency' : ''
+    end
+
+    def for_instrument(options)
+      raise 'instrument_name param is required' unless options[:instrument_name]
+
+      ".#{options[:instrument_name]}"
+    end
+
+    def for_currency(options)
+      raise 'currency param is required' unless options[:currency]
+
+      kind = options[:kind] || 'any'
+      ".#{kind}.#{options[:currency]}"
+    end
+
+    def with_interval(options)
+      interval = options[:interval] || '100ms'
+      ".#{interval}"
+    end
+
+    def with_group_and_depth(options)
+      if options[:group] || options[:depth]
+        group = options[:group] || '5'
+        depth = options[:depth] || '10'
+        ".#{group}.#{depth}"
+      else
+        ''
+      end
+    end
+  end
+end

data/lib/deribit/version.rb

@@ -1,3 +1,3 @@
 module Deribit
-  VERSION = '0.1.3'
+  VERSION = '2.0.2'
 end

data/lib/deribit/websocket.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Deribit
-  # Websocket API
-  # @see https://docs.deribit.com/api-websocket.html
+  # Websocket API adapter
+  # @author Iulian Costan (deribit-api@iuliancostan.com)
+  # @see https://docs.deribit.com/#subscriptions
   class Websocket
-    attr_reader :host, :key, :secret
+    attr_reader :host, :key, :secret, :access_token, :callbacks
 
     # Create new websocket instance
     # @param host [String] the underlying host to connect to
@@ -14,6 +17,7 @@ module Deribit
       @key = key
       @secret = secret
       @callbacks = {}
+      @ws = nil
     end
 
     # Subscribe to a specific topic and optionally filter by symbol
@@ -21,85 +25,104 @@ module Deribit
     # @param params [Hash] the arguments for subscription
     # @yield [Array] data payload
     def subscribe(topic, params: {}, &callback)
-      raise 'callback block is required' unless block_given?
-
-      EM.run do
-        connect
+      raise 'block is required' unless block_given?
 
-        # request id
-        id = Time.now.to_i
-        @callbacks[id] = callback
+      # connect on demand
+      @ws = connect unless connected?
+      raise 'websocket is closed' unless @ws.open?
 
-        # request action
-        auth = params.delete :auth
-        uri = auth ? 'private' : 'public'
-        action = "/api/v1/#{uri}/#{topic}"
+      # save callback handler
+      @callbacks[topic.to_s] = callback
 
-        payload = { id: id, action: action, arguments: params }
-        payload[:sig] = signature id, action, params if auth
+      # authorize if needed
+      authorize if authorization_required?(topic)
 
-        @faye.send payload.to_json.to_s
-      end
+      # subscription request
+      payload = {
+        jsonrpc: '2.0',
+        method: 'public/subscribe',
+        id: rand(9999),
+        params: { channels: [topic] }
+      }
+      @ws.send payload.to_json.to_s
     end
 
-    # Stop websocket listener
-    def stop
-      EM.stop_event_loop
+    def authorized?
+      !access_token.nil?
     end
 
     private
 
-    def signature(nonce, action, params)
-      payload = {
-        _: nonce,
-        _ackey: @key,
-        _acsec: @secret,
-        _action: action
-      }
-      payload.merge! params
-      # query = env['url'].query
+    def connected?
+      !@ws.nil?
+    end
 
-      Deribit.signature @key, nonce, payload, nil
+    def authorization_required?(topic)
+      topic.include? 'user'
     end
 
-    def websocket_url
-      "wss://#{host}/ws/api/v1/"
+    def authorize
+      @callbacks['auth'] = lambda do |result|
+        @access_token = result['access_token']
+      end
+
+      @ws.send authorize_payload.to_json.to_s
     end
 
-    def headers
-      {}
+    def authorize_payload
+      timestamp = Time.now.utc.to_i * 1000
+      nonce = rand(999_999).to_s
+      signature = Deribit.signature timestamp, nonce, '', @secret
+      {
+        jsonrpc: '2.0',
+        method: 'public/auth',
+        id: 'auth',
+        params: {
+          grant_type: :client_signature,
+          client_id: @key,
+          timestamp: timestamp,
+          nonce: nonce,
+          data: '',
+          signature: signature
+        }
+      }
+    end
+
+    def websocket_url
+      "wss://#{host}/ws/api/v2"
     end
 
     def connect
-      @result = nil
-      @faye = Faye::WebSocket::Client.new websocket_url, [], headers: headers
-      @faye.on :open do |_event|
-        # puts [:open, event.data]
+      websocket = self
+      ws = WebSocket::Client::Simple.connect websocket_url
+      ws.on :open do |event|
+        # puts [:open, event]
       end
-      @faye.on :error do |event|
-        raise event.message
+      ws.on :error do |event|
+        # puts [:error, event.inspect]
       end
-      @faye.on :close do |_event|
+      ws.on :close do |event|
         # puts [:close, event.reason]
-        @faye = nil
+        ws = nil
       end
-      @faye.on :message do |event|
+      ws.on :message do |event|
         json = JSON.parse event.data
-        id = json['id']
-        data = json['result'] || json['message']
-
-        callback = @callbacks[id]
-        # TODO: rewrite this part
-        if callback && data
-          data = [data] unless data.is_a? Array
-          data.each do |payload|
-            payload = Hashie::Mash.new payload if payload.is_a? Hash
-            @result = callback.yield payload, @result
+        if json['method'] == 'subscription'
+          id = json['params']['channel']
+          data = json['params']['data']
+          callback = websocket.callbacks[id]
+          data = [data] if data.is_a? Hash
+          data.each do |datum|
+            @result = callback.yield Hashie::Mash.new(datum)
           end
         else
-          puts "==> #{event.data}"
+          id = json['id']
+          callback = websocket.callbacks[id]
+          callback&.yield json['result']
         end
       end
+      until ws.open? do sleep 1 end # wait for opening
+      ws
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deribit-api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 2.0.2
 platform: ruby
 authors:
 - Iulian Costan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: faraday-detailed_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: websocket-client-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -192,9 +206,51 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Ruby library for Deribit API
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Idiomatic Ruby library for Deribit API 2.0
 email:
-- iulian.costan@gmail.com
+- deribit-api@iuliancostan.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -210,14 +266,19 @@ files:
 - README.md
 - Rakefile
 - TODOs.org
+- bin/auth.sh
 - bin/console
 - bin/setup
+- bin/trades.py
+- bin/trades.rb
+- bin/whales-watching.rb
 - deribit.gemspec
 - lib/deribit-api.rb
 - lib/deribit.rb
 - lib/deribit/authentication.rb
 - lib/deribit/client.rb
 - lib/deribit/http.rb
+- lib/deribit/naming.rb
 - lib/deribit/version.rb
 - lib/deribit/websocket.rb
 homepage: https://github.com/icostan/deribit-api-ruby
@@ -227,7 +288,7 @@ metadata:
   homepage_uri: https://github.com/icostan/deribit-api-ruby
   source_code_uri: https://github.com/icostan/deribit-api-ruby.git
   changelog_uri: https://github.com/icostan/deribit-api-ruby/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -242,8 +303,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
-summary: Ruby library for Deribit API
+summary: Idiomatic Ruby library for Deribit API 2.0
 test_files: []