lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-09-20 08:11:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #369 from tony1223/feature/ftx-refine-kline-event

Browse Source 
exchange: make ftx kline event more reliable
This commit is contained in:
Yo-An Lin 2021-12-15 11:34:26 +08:00 committed by GitHub
commit 3266571698
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/bbgo/session.go
View File

@ -318,6 +318,10 @@ func (session *ExchangeSession) Init(ctx context.Context, environ *Environment)
}
}
session.MarketDataStream.OnKLine(func(kline types.KLine) {
log.WithField("marketData", "kline").Infof("kline : %+v", kline)
})
session.MarketDataStream.OnKLineClosed(func(kline types.KLine) {
log.WithField("marketData", "kline").Infof("kline closed: %+v", kline)
})

33
pkg/exchange/ftx/stream.go
View File

@ -135,20 +135,22 @@ func (s *Stream) Subscribe(channel types.Channel, symbol string, option types.Su
}
func (s *Stream) pollKLines(ctx context.Context) {
lastClosed := time.Time{}
// get current kline candle
for _, sub := range s.klineSubscriptions {
klines := getLastClosedKLine(s.exchange, ctx, sub.symbol, sub.interval)
klines := getLast2KLine(s.exchange, ctx, sub.symbol, sub.interval)
if len(klines) > 0 {
// handle mutiple klines, get the latest one
kline := klines[len(klines)-1]
s.EmitKLine(kline)
s.EmitKLineClosed(kline)
s.EmitKLine(klines[0])
s.EmitKLineClosed(klines[0])
s.EmitKLine(klines[1])
lastClosed = klines[0].StartTime
}
}
// the highest resolution of kline is 1min
ticker := time.NewTicker(time.Minute)
ticker := time.NewTicker(time.Second * 30)
defer ticker.Stop()
for {
@ -166,20 +168,23 @@ func (s *Stream) pollKLines(ctx context.Context) {
// not in the checking time slot, check next subscription
continue
}
klines := getLastClosedKLine(s.exchange, ctx, sub.symbol, sub.interval)
klines := getLast2KLine(s.exchange, ctx, sub.symbol, sub.interval)
if len(klines) > 0 {
// handle mutiple klines, get the latest one
kline := klines[len(klines)-1]
s.EmitKLine(kline)
s.EmitKLineClosed(kline)
if lastClosed.Unix() < klines[0].StartTime.Unix() {
s.EmitKLine(klines[0])
s.EmitKLineClosed(klines[0])
lastClosed = klines[0].StartTime
}
s.EmitKLine(klines[1])
}
}
}
}
}
func getLastClosedKLine(e *Exchange, ctx context.Context, symbol string, interval types.Interval) []types.KLine {
func getLast2KLine(e *Exchange, ctx context.Context, symbol string, interval types.Interval) []types.KLine {
// set since to more 30s ago to avoid getting no kline candle
since := time.Now().Add(time.Duration(interval.Minutes()*-3) * time.Minute)
klines, err := e.QueryKLines(ctx, symbol, interval, types.KLineQueryOptions{
@ -191,6 +196,12 @@ func getLastClosedKLine(e *Exchange, ctx context.Context, symbol string, interva
return klines
}
return klines
}
func getLastClosedKLine(e *Exchange, ctx context.Context, symbol string, interval types.Interval) []types.KLine {
// set since to more 30s ago to avoid getting no kline candle
klines := getLast2KLine(e, ctx, symbol, interval)
return []types.KLine{klines[0]}
}