fix panic on close, create handler interface

larscom · Apr 7, 2024 · d2307f2 · d2307f2
1 parent 7faafa3
commit d2307f2
Show file tree

Hide file tree

Showing 7 changed files with 140 additions and 103 deletions.
diff --git a/ws/account.go b/ws/account.go
@@ -196,6 +196,19 @@ func (a *accountEventHandler) UnsubscribeAll() error {
 	return nil
 }
 
+func (a *accountEventHandler) handleMessage(e WsEvent, bytes []byte) {
+	switch e {
+	case wsEventAuth:
+		a.handleAuthMessage(bytes)
+	case wsEventOrder:
+		a.handleOrderMessage(bytes)
+	case wsEventFill:
+		a.handleFillMessage(bytes)
+	default:
+		log.Debug().Str("event", e.Value).Msg("no handler for this account event (should not happen)")
+	}
+}
+
 func (a *accountEventHandler) handleOrderMessage(bytes []byte) {
 	var orderEvent *OrderEvent
 	if err := json.Unmarshal(bytes, &orderEvent); err != nil {

diff --git a/ws/book.go b/ws/book.go
@@ -98,7 +98,7 @@ func (b *bookEventHandler) UnsubscribeAll() error {
 	return nil
 }
 
-func (b *bookEventHandler) handleMessage(bytes []byte) {
+func (b *bookEventHandler) handleMessage(_ WsEvent, bytes []byte) {
 	var bookEvent *BookEvent
 	if err := json.Unmarshal(bytes, &bookEvent); err != nil {
 		log.Err(err).Str("message", string(bytes)).Msg("Couldn't unmarshal message into BookEvent")

diff --git a/ws/candles.go b/ws/candles.go
@@ -154,7 +154,7 @@ func (c *candlesEventHandler) UnsubscribeAll() error {
 	return nil
 }
 
-func (c *candlesEventHandler) handleMessage(bytes []byte) {
+func (c *candlesEventHandler) handleMessage(_ WsEvent, bytes []byte) {
 	var candleEvent *CandlesEvent
 	if err := json.Unmarshal(bytes, &candleEvent); err != nil {
 		log.Err(err).Str("message", string(bytes)).Msg("Couldn't unmarshal message into CandlesEvent")

diff --git a/ws/ticker.go b/ws/ticker.go
@@ -98,7 +98,7 @@ func (t *tickerEventHandler) UnsubscribeAll() error {
 	return nil
 }
 
-func (t *tickerEventHandler) handleMessage(bytes []byte) {
+func (t *tickerEventHandler) handleMessage(_ WsEvent, bytes []byte) {
 	var tickerEvent *TickerEvent
 	if err := json.Unmarshal(bytes, &tickerEvent); err != nil {
 		log.Err(err).Str("message", string(bytes)).Msg("Couldn't unmarshal message into TickerEvent")

diff --git a/ws/ticker24h.go b/ws/ticker24h.go
@@ -111,7 +111,7 @@ func (t *ticker24hEventHandler) UnsubscribeAll() error {
 	return nil
 }
 
-func (t *ticker24hEventHandler) handleMessage(bytes []byte) {
+func (t *ticker24hEventHandler) handleMessage(_ WsEvent, bytes []byte) {
 	var ticker24hEvent *Ticker24hEvent
 	if err := json.Unmarshal(bytes, &ticker24hEvent); err != nil {
 		log.Err(err).Str("message", string(bytes)).Msg("Couldn't unmarshal message into Ticker24hEvent")

diff --git a/ws/trades.go b/ws/trades.go
@@ -98,7 +98,7 @@ func (t *tradesEventHandler) UnsubscribeAll() error {
 	return nil
 }
 
-func (t *tradesEventHandler) handleMessage(bytes []byte) {
+func (t *tradesEventHandler) handleMessage(_ WsEvent, bytes []byte) {
 	var tradeEvent *TradesEvent
 	if err := json.Unmarshal(bytes, &tradeEvent); err != nil {
 		log.Err(err).Str("message", string(bytes)).Msg("Couldn't unmarshal message into TradesEvent")