okex 0.2.0 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dae1478814bf6ccebb68aaf3bd52c3ac834148cb90b4b8e8f6427ccc811304eb
-  data.tar.gz: 53bc2e5e42b90f1f60390273a82f98fa4caf19c07d238f38edac4bbf7a51a572
+  metadata.gz: 012c9b50e5c4dd3fb5522d0eef07764feb177c23a2aee07e1a847399fb7b7d68
+  data.tar.gz: 43f87e76c36c65bf9b81122392b36af8bee0f5125617b28ff2a6e2ae6a36196a
 SHA512:
-  metadata.gz: 0afed6eb2d1e37d817e8f172d3713a1aec653a3eb70cab406523e5e7fc21aae803f0a64d16e11fa73440d34507c37303d2f33c7669ecc5218657546f322ce295
-  data.tar.gz: 6bb22c3ce7cc7b3a739a975d7a7b3239edb5d2e5edb9bc5ea056229ca238ab806c25fc9c8703bedc8e969d28cea42c8119733ac603d11db359fcbad13e418594
+  metadata.gz: 84533cb2cc12b733a01c29a3f76274e1b179573fa0ad21e2588c87b04e76e9afdca18979c22056b4fa4c75fbec578e7fbb319e198721bedb9150e39e4f819f2a
+  data.tar.gz: 839673d67fed38b99dce0b5d5f31df562e56d9617c5e7c87cad1772136b616c60d457d6d9397427372bb0b6fd4168c9b035a8d74fb50b972c9bfc68e48defbce

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    okex (0.1.21)
+    okex (0.2.5)
       faraday (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    byebug (11.1.3)
     diff-lcs (1.4.4)
     faraday (1.5.0)
       faraday-em_http (~> 1.0)
@@ -47,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.17)
+  byebug (~> 11.1)
   okex!
   rake (~> 10.0)
   rspec (~> 3.0)

data/lib/okex.rb

@@ -3,8 +3,11 @@ require "okex/api_v3"
 require "okex/api_v5"
 require "okex/client"
 require "okex/coin"
-require "openssl"
-require "faraday"
+require "okex/order"
+require "okex/account_order"
+require "okex/trade_order"
+require "okex/host"
+
 
 module OKEX
   class Error < StandardError; end

data/lib/okex/account_order.rb

@@ -0,0 +1,4 @@
+module OKEX
+  class AccountOrder < Order
+  end
+end

data/lib/okex/api_v5.rb

@@ -1,10 +1,31 @@
 class OKEX::ApiV5
-  def initialize(client)
+  def initialize(client, host)
     @client = client
+    @host = host
   end
 
   def instruments
-    client.get("/api/v5/public/instruments")
+    client.get(host, "/api/v5/public/instruments?instType=SWAP")
+  end
+
+  def account_orders
+    resp = client.get(host, "/api/v5/account/positions")
+    
+    if resp['success']
+      return resp['data'].map {|params| OKEX::AccountOrder.new(params)}
+    end
+
+    []
+  end
+
+  def trade_orders(instrument_id)
+    resp = client.get(host, "/api/v5/trade/order?instId=#{instrument_id}")
+    
+    if resp['code'].to_i == 0 && resp['data'].size > 0
+      return resp['data'].map {|params| OKEX::TradeOrder.new(params)}
+    end
+
+    []
   end
 
   def short_swap(instid, amount)
@@ -17,28 +38,28 @@ class OKEX::ApiV5
       "sz": "1"
     }
 
-    client.post("/api/v5/trade/order", params)
+    client.post(host, "/api/v5/trade/order", params)
   end
 
-  def close_long(instid)
-    close_position(instid, "long")
+  def close_long(instrument_id)
+    close_position(instrument_id, "long")
   end
 
-  def close_short(instid)
-    close_position(instid, "short")
+  def close_short(instrument_id)
+    close_position(instrument_id, "short")
   end
 
   private
 
-  attr_reader :client
+  attr_reader :client, :host
 
-  def close_position(instid, direction)
+  def close_position(instrument_id, direction)
     params = {
-      "instId": instid,
+      "instId": instrument_id,
       "mgnMode": "cross",
       "posSide": direction
     }
 
-    client.post("/api/v5/trade/close-position", params)
+    client.post(host, "/api/v5/trade/close-position", params)
   end
 end

data/lib/okex/client.rb

@@ -1,4 +1,7 @@
 require 'time'
+require 'base64'
+require 'json'
+require 'faraday'
 
 module OKEX
   class Client
@@ -8,34 +11,26 @@ module OKEX
       @passphrase = passphrase
     end
 
-    def get(path)
+    def get(host, path)
       ts = timestamp
       sig = sign(ts, "GET", path)
 
-      _resp(::Faraday.get(HOST + path, nil, headers(ts, sig)))
+      _resp(Faraday.get(host + path, nil, headers(ts, sig)))
     end
 
-    def post(path, payload)
+    def post(host, path, payload)
       payload_json = gen_payload(payload)
 
       ts = timestamp
       sig = sign(ts, "POST", path + payload_json)
 
-      begin
-        conn = ::Faraday.new(HOST + path, :ssl => {:verify => false})
-        result = conn.post(HOST + path, payload_json, headers(ts, sig))
-        _resp(result)
-      rescue => e
-        puts "[error] #{e.inspect}"
-      end
+      _resp(Faraday.post(host + path, payload_json, headers(ts, sig)))
     end
 
     private
 
     attr_reader :api_key, :api_secret, :passphrase
 
-    HOST = "https://www.okex.com"
-
     def gen_payload(payload)
       m = payload.map { |k, v| JSON.generate({k => v}, {space: ' '})}
       m2 = m.join(", ").gsub("{", "").gsub("}", "")
@@ -65,7 +60,14 @@ module OKEX
     end
 
     def _resp(result)
-      JSON.parse(result.body)
+      result = JSON.parse(result.body)
+      
+      code = result['code'].to_i
+      if code == 0 && result['msg'].empty?
+        return {'success' => true, 'data' => result['data']}
+      else
+        return {'success' => false, 'code' => code, 'msg' => result['msg']}
+      end
     end
   end
 end

data/lib/okex/host.rb

@@ -0,0 +1,12 @@
+class OKEX::Host
+  OUYI_HOST = "https://www.ouyi.cc".freeze
+  OKEX_HOST = "https://www.okex.com".freeze
+
+  def self.ouyi
+    OUYI_HOST
+  end
+
+  def self.okex
+    OKEX_HOST
+  end
+end

data/lib/okex/order.rb

@@ -0,0 +1,80 @@
+module OKEX
+  class Order
+    POS_LONG = 'long'.freeze
+    POS_SHORT = 'short'.freeze
+
+    def initialize(params)
+      @params = params
+    end
+
+    def instrument_id
+      dig("instId")
+    end
+    
+    # 杠杆倍数
+    def leverage
+      dig("lever")
+    end
+
+    def created_at
+      Time.at(dig("cTime").to_i / 1000)
+    end
+
+    # 平均开仓价
+    def avg_open_price
+      dig("avgPx").to_f
+    end
+
+    # 预估强平价
+    def est_liq_price
+      dig("liqPx").to_f
+    end
+
+    # 最新成交价
+    def last_price
+      dig("last").to_f
+    end
+
+    # 持仓方向
+    def position_side
+      side = dig("posSide")
+      if [POS_SHORT, POS_LONG].include?(side)
+        return side
+      end
+    end
+
+    def long?
+      position_side == POS_LONG
+    end
+
+    def short?
+      position_side == POS_SHORT
+    end
+
+    # 开仓方向名称
+    def position_name
+      case position_side
+      when POS_SHORT
+        '空'
+      when POS_LONG
+        '多'
+      end
+    end
+
+    # 未实现收益
+    def upl
+      dig("upl").to_f
+    end
+
+    # 持仓张数
+    def pos
+      dig("pos").to_i
+    end
+
+    private
+
+    def dig(key)
+      @params[key]
+    end
+  end
+end

data/lib/okex/trade_order.rb

@@ -0,0 +1,24 @@
+module OKEX
+  class TradeOrder < Order
+
+    # 预估强平价
+    def est_liq_price
+      dig("liqPx").to_f
+    end
+
+    # 最新成交价
+    def last_price
+      dig("fillPx").to_f
+    end
+
+    # 未实现收益
+    def upl
+      dig("pnl").to_f
+    end
+
+    # 持仓张数
+    def pos
+      dig("sz").to_i
+    end
+  end
+end

data/lib/okex/version.rb

@@ -1,3 +1,3 @@
 module OKEX
-  VERSION = "0.2.0"
+  VERSION = "0.2.6"
 end

data/okex.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "byebug", "~> 11.1"
 
   spec.add_runtime_dependency "faraday", "~> 1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.6
 platform: ruby
 authors:
 - David Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-14 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -85,11 +99,15 @@ files:
 - bin/console
 - bin/setup
 - lib/okex.rb
+- lib/okex/account_order.rb
 - lib/okex/api_v3.rb
 - lib/okex/api_v5.rb
 - lib/okex/client.rb
 - lib/okex/coin.rb
 - lib/okex/coin/bitcoin.rb
+- lib/okex/host.rb
+- lib/okex/order.rb
+- lib/okex/trade_order.rb
 - lib/okex/version.rb
 - okex.gemspec
 homepage: https://github.com/daqing/okex