Fixed OKX Futures (Perp only)

aneonex · May 17, 2022 · 3a7285f · 3a7285f
1 parent ec6a6cf
commit 3a7285f
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 78 deletions.
diff --git a/dataModule/src/main/java/com/aneonex/bitcoinchecker/datamodule/model/market/Okex.kt b/dataModule/src/main/java/com/aneonex/bitcoinchecker/datamodule/model/market/Okex.kt
@@ -33,11 +33,8 @@ class Okex : SimpleMarket(
             }
     }
 
-    override fun getPairId(checkerInfo: CheckerInfo): String? {
-        return checkerInfo.currencyPairId?.let {
-            "${checkerInfo.currencyBase}-${checkerInfo.currencyCounter}"
-        }
-    }
+    override fun getPairId(checkerInfo: CheckerInfo): String =
+        checkerInfo.currencyPairId ?: "${checkerInfo.currencyBase}-${checkerInfo.currencyCounter}"
 
     @Throws(Exception::class)
     override fun parseTickerFromJsonObject(requestId: Int, jsonObject: JSONObject, ticker: Ticker, checkerInfo: CheckerInfo) {

diff --git a/dataModule/src/main/java/com/aneonex/bitcoinchecker/datamodule/model/market/OkexFutures.kt b/dataModule/src/main/java/com/aneonex/bitcoinchecker/datamodule/model/market/OkexFutures.kt
@@ -1,90 +1,58 @@
 package com.aneonex.bitcoinchecker.datamodule.model.market
 
-import com.aneonex.bitcoinchecker.datamodule.model.*
-import com.aneonex.bitcoinchecker.datamodule.util.TimeUtils
+import com.aneonex.bitcoinchecker.datamodule.model.CheckerInfo
+import com.aneonex.bitcoinchecker.datamodule.model.CurrencyPairInfo
+import com.aneonex.bitcoinchecker.datamodule.model.FuturesContractType
+import com.aneonex.bitcoinchecker.datamodule.model.Ticker
+import com.aneonex.bitcoinchecker.datamodule.model.market.generic.SimpleMarket
 import com.aneonex.bitcoinchecker.datamodule.util.forEachJSONObject
-import org.json.JSONArray
 import org.json.JSONObject
-import java.time.format.DateTimeFormatter
-import java.util.*
 
-class OkexFutures : Market(
-    NAME,
-    NAME,
-    null
+class OkexFutures : SimpleMarket(
+    "OKX Futures",
+    "https://www.okx.com/api/v5/market/tickers?instType=SWAP",
+    "https://www.okx.com/api/v5/market/ticker?instId=%1\$s"
 ) {
 
-    override val currencyPairsNumOfRequests: Int
-        get() = 2
-
-    override fun getCurrencyPairsUrl(requestId: Int): String =
-        if(requestId == 0) URL_PAIRS_PERPETUAL else URL_PAIRS_FUTURES
-
-    override fun getUrl(requestId: Int, checkerInfo: CheckerInfo): String {
-        val urlTemplate = if(checkerInfo.contractType <= FuturesContractType.PERPETUAL)
-            URL_TICKER_PERPETUAL
-        else
-            URL_TICKER_FUTURES
-
-        return String.format(urlTemplate, calculateFuturesPairId(checkerInfo))
-    }
-
-    override fun parseCurrencyPairs(requestId: Int, responseString: String, pairs: MutableList<CurrencyPairInfo>) {
-        fun parseContractType(value: String): FuturesContractType? =
-            when(value) {
-                "this_week" -> FuturesContractType.WEEKLY
-                "next_week" -> FuturesContractType.BIWEEKLY
-                "quarter" -> FuturesContractType.QUARTERLY
-                "bi_quarter" -> FuturesContractType.BIQUARTERLY
-                else -> null
-            }
-
-        JSONArray(responseString)
+    override fun parseCurrencyPairsFromJsonObject(
+        requestId: Int,
+        jsonObject: JSONObject,
+        pairs: MutableList<CurrencyPairInfo>
+    ) {
+        jsonObject
+            .getJSONArray("data")
             .forEachJSONObject {
-//                val deliveryType = parseFuturesType(it.getString("alias")) ?: return@forEachJSONObject
-
-                val contractType: FuturesContractType =
-                    if(requestId == 0) FuturesContractType.PERPETUAL
-                    else parseContractType(it.getString("alias")) ?: return@forEachJSONObject
-
-                pairs.add(
-                    CurrencyPairInfo(
-                        it.getString("base_currency"),
-                        it.getString("quote_currency"),
-                        it.getString("instrument_id"),
-                        contractType
-                        )
-                )
+                val pairId = it.getString("instId")
+                val assets = pairId.split('-')
+
+                if(assets.size == 3 && assets[2] == "SWAP") {
+                    pairs.add(CurrencyPairInfo(
+                        assets[0],
+                        assets[1],
+                        pairId,
+                        FuturesContractType.PERPETUAL
+                    ))
+                }
             }
     }
 
+    @Throws(Exception::class)
     override fun parseTickerFromJsonObject(requestId: Int, jsonObject: JSONObject, ticker: Ticker, checkerInfo: CheckerInfo) {
-        ticker.bid = jsonObject.getDouble("best_bid")
-        ticker.ask = jsonObject.getDouble("best_ask")
-        ticker.vol = jsonObject.getDouble("volume_token_24h")
-        ticker.high = jsonObject.getDouble("high_24h")
-        ticker.low = jsonObject.getDouble("low_24h")
-        ticker.last = jsonObject.getDouble("last")
-        ticker.timestamp =  TimeUtils.convertISODateToTimestamp(jsonObject.getString("timestamp"))
-    }
-
-    companion object {
-        private const val NAME = "OKX Futures"
+        jsonObject
+            .getJSONArray("data")
+            .getJSONObject(0)
+            .also {
+                ticker.bid = it.getDouble("bidPx")
+                ticker.ask = it.getDouble("askPx")
 
-        private const val URL_PAIRS_PERPETUAL = "https://www.okex.com/api/swap/v3/instruments"
-        private const val URL_PAIRS_FUTURES = "https://www.okex.com/api/futures/v3/instruments"
+                ticker.vol = it.getDouble("vol24h")
+                ticker.volQuote = it.getDouble("volCcy24h")
 
-        private const val URL_TICKER_PERPETUAL = "https://www.okex.com/api/swap/v3/instruments/%1\$s/ticker"
-        private const val URL_TICKER_FUTURES = "https://www.okex.com/api/futures/v3/instruments/%1\$s/ticker"
+                ticker.high = it.getDouble("high24h")
+                ticker.low = it.getDouble("low24h")
 
-        //private val FUTURES_DATE_FORMAT = SimpleDateFormat("yyMMdd", Locale.ROOT)
-        private val FUTURES_DATE_FORMAT = DateTimeFormatter.ofPattern("yyMMdd", Locale.ROOT)
-
-        private fun calculateFuturesPairId(checkerInfo: CheckerInfo): String? {
-            val targetDate = FuturesContractType.getDeliveryDate(checkerInfo.contractType)
-                ?: return checkerInfo.currencyPairId
-
-            return with(checkerInfo){ "$currencyBase-$currencyCounter-${FUTURES_DATE_FORMAT.format(targetDate)}" }
-        }
+                ticker.last = it.getDouble("last")
+                ticker.timestamp =  it.getLong("ts")
+            }
     }
 }