lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-22 23:05:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(ftx): send ctx to handleChannelKlineMessage()

Browse Source
This commit is contained in:
Jui-Nan Lin 2021-05-24 10:16:17 +08:00
parent 64387ed2cb
commit ddcd0d3969
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,8 @@ type Stream struct {
*types.StandardStream
ws *service.WebsocketClientBase
klineMessage chan types.KLine
km chan klineMessage
exchange *Exchange
ctx context.Context
// publicOnly can only be configured before connecting
publicOnly int32
@ -33,11 +32,16 @@ type Stream struct {
subscriptions []websocketRequest
}
type klineMessage struct {
symbol string
interval types.Interval
}
func NewStream(key, secret string, subAccount string, e *Exchange) *Stream {
s := &Stream{
exchange: e,
key: key,
klineMessage: make(chan types.KLine),
km: make(chan klineMessage),
secret: secret,
subAccount: subAccount,
StandardStream: &types.StandardStream{},
@ -69,9 +73,8 @@ func (s *Stream) Connect(ctx context.Context) error {
if err := s.ws.Connect(ctx); err != nil {
return err
}
s.ctx = ctx
s.EmitStart()
go s.handleChannelKlineMessage()
go s.handleChannelKlineMessage(ctx)
go func() {
// https://docs.ftx.com/?javascript#request-process
@ -130,12 +133,16 @@ func (s *Stream) Subscribe(channel types.Channel, symbol string, option types.Su
}
}
func (s *Stream) handleChannelKlineMessage() {
func (s *Stream) handleChannelKlineMessage(ctx context.Context) {
for {
select {
case kline := <-s.klineMessage:
case km := <-s.km:
// FTX only returns closed kline
s.EmitKLineClosed(kline)
klines := getLastKLine(s.exchange, ctx, km.symbol, km.interval)
if len(klines) >= 0 {
// handle mutiple klines, get the latest one
s.EmitKLineClosed(klines[len(klines)-1])
}
}
}
}
@ -152,16 +159,8 @@ func (s *Stream) subscribeKLine(symbol string, option types.SubscribeOptions) {
for {
select {
case <-s.ctx.Done():
if err := s.ctx.Err(); err != nil {
logger.WithError(err).Errorf("subscribeKLine goroutine is terminated")
}
case <-ticker.C:
klines := getLastKLine(s.exchange, s.ctx, symbol, interval)
if len(klines) >= 0 {
// handle mutiple klines, get the latest one
s.klineMessage <- klines[len(klines)-1]
}
s.km <- klineMessage{symbol: symbol, interval: interval}
}
}
}