Commit f083068d by zihan

改为rest来请求深度

parent d740473f
...@@ -5,7 +5,7 @@ const agent = proxy ? new SocksProxyAgent(proxy) : null; ...@@ -5,7 +5,7 @@ const agent = proxy ? new SocksProxyAgent(proxy) : null;
const request = require('request'); const request = require('request');
const proHost = 'https://api.kucoin.com'; const proHost = 'https://api.kucoin.com';
const testHost = 'https://openapi-sandbox.kucoin.com'; const testHost = 'https://openapi-sandbox.kucoin.com';
const CryptoJS = require('crypto-js'); // const CryptoJS = require('crypto-js');
const crypto = require('crypto'); const crypto = require('crypto');
const constants = require('./constants'); const constants = require('./constants');
const {IPs, mergeDepthAsk, mergeDepthBids, mergeDepth} = require('./util'); const {IPs, mergeDepthAsk, mergeDepthBids, mergeDepth} = require('./util');
...@@ -364,7 +364,9 @@ class biboxApi { ...@@ -364,7 +364,9 @@ class biboxApi {
} }
getOrderbook(symbol, depth, bindIP, callback) { getOrderbook(symbol, depth, bindIP, callback) {
this._publicRequest("/api/v1/market/orderbook/level2_100", {"symbol": symbol}, callback, bindIP); this._publicRequest("/api/v1/market/orderbook/level2_20", {"symbol": symbol}, (error,result)=>{
callback(error,result,symbol);
}, bindIP);
} }
} }
......
...@@ -2,7 +2,7 @@ const BaseCollector = require('./baseCollector'); ...@@ -2,7 +2,7 @@ const BaseCollector = require('./baseCollector');
const baseCurrencies = ["ETH","BTC","USDT"]; const baseCurrencies = ["ETH","BTC","USDT"];
const machine = process.env['MACHINE']; const machine = process.env['MACHINE'];
const biboxApi = require('./api_kucoin'); const biboxApi = require('./api_kucoin');
const IPs = require('./util'); const {IPs} = require('./util');
let coinInfoMap = null; let coinInfoMap = null;
// const totalOrderbook = {}; // const totalOrderbook = {};
const Strategy3MaxAmountMap = { const Strategy3MaxAmountMap = {
...@@ -45,7 +45,35 @@ class KucoinCollector extends BaseCollector{ ...@@ -45,7 +45,35 @@ class KucoinCollector extends BaseCollector{
} }
_subscribeSymbols(symbols,callback,subscribeDepth){ _subscribeSymbols(symbols,callback,subscribeDepth){
this._fetchDepthByWebsocket(symbols,subscribeDepth,callback) const filteredSymbols = symbols.filter((item)=>{
const keySymbol = this._convertSymbolName(item);
const mid = this.getMidCurrency(keySymbol);
if(this.baseCurrencies.includes(mid)){
return true;
}
const array = this.getSymbols(mid);
return array.length >1
}).sort();
function depthCallback(error,result,symbol){
if(error){
console.error(error);
}else{
const timestamp = result.data.time;
const bids = result.data.bids.slice(0,subscribeDepth);
const asks = result.data.asks.slice(0, subscribeDepth);
const version = result.data.sequence;
callback(asks,bids,symbol,timestamp, version);
}
}
console.log("共有IP个数:"+ IPs.length);
const interval = Math.round(100/IPs.length);
let index = 0;
setInterval(()=>{
this.api.getOrderbook(filteredSymbols[index % filteredSymbols.length], 5, IPs[index % IPs.length], depthCallback.bind(this));
},interval);
// this._fetchDepthByWebsocket(symbols,subscribeDepth,callback)
// setTimeout(()=>{ // setTimeout(()=>{
// this._fetchDepthByRest(symbols,subscribeDepth,callback); // this._fetchDepthByRest(symbols,subscribeDepth,callback);
// },20000); // },20000);
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"strategy2": "node $NODE_DEBUG_OPTION strategy2.js", "strategy2": "node $NODE_DEBUG_OPTION strategy2.js",
"test": "export MACHINE=K; export http_proxy='http://localhost:8118';export https_proxy='http://localhost:8118';export agent='socks:127.0.0.1:1086';node $NODE_DEBUG_OPTION test_kucoin.js", "test": "export MACHINE=K; export KEY='123';export SECRET='345';export http_proxy='http://localhost:8118';export https_proxy='http://localhost:8118';export agent='socks:127.0.0.1:1086';node $NODE_DEBUG_OPTION test_kucoin.js",
"strategy3": "export MACHINE=K;export http_proxy='http://localhost:8118';export https_proxy='http://localhost:8118';export agent='socks:127.0.0.1:1086';node $NODE_DEBUG_OPTION kucoinStrategy3.js" "strategy3": "export MACHINE=K;export http_proxy='http://localhost:8118';export https_proxy='http://localhost:8118';export agent='socks:127.0.0.1:1086';node $NODE_DEBUG_OPTION kucoinStrategy3.js"
}, },
"author": "", "author": "",
......
...@@ -43,7 +43,7 @@ function testCollector(){ ...@@ -43,7 +43,7 @@ function testCollector(){
// const strategy3 = new BiboxStrategy3(collector); // const strategy3 = new BiboxStrategy3(collector);
// strategy3.run(); // strategy3.run();
} }
// testCollector(); testCollector();
function printCurrency(){ function printCurrency(){
const currentArray = [,'ETH','BTC','LTC','BCH','USDT','USD','RMB',"RCN","WINGS","TRX","LEND","CMT","POWR","HSR","GAS","RDN","TNT","OAX" const currentArray = [,'ETH','BTC','LTC','BCH','USDT','USD','RMB',"RCN","WINGS","TRX","LEND","CMT","POWR","HSR","GAS","RDN","TNT","OAX"
...@@ -121,7 +121,7 @@ function printCurrency(){ ...@@ -121,7 +121,7 @@ function printCurrency(){
} }
}) })
} }
printCurrency() // printCurrency()
function testOrder(){ function testOrder(){
const Order = require('./order_kucoin'); const Order = require('./order_kucoin');
...@@ -164,7 +164,7 @@ function testOrder(){ ...@@ -164,7 +164,7 @@ function testOrder(){
// console.log(result); // console.log(result);
// }) // })
} }
testOrder(); // testOrder();
// const amount = (0.0917 * parseFloat(0.00001005)).toFixed(10); // const amount = (0.0917 * parseFloat(0.00001005)).toFixed(10);
// console.log(amount); // console.log(amount);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment