Merge pull request amir-the-h#10 from renat1015/main

fix and upgrade api ws
bmstar2012 · May 11, 2022 · c04f8a9 · c04f8a9
2 parents 4b18bcd + 3bc8580
commit c04f8a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/api/ws/client.go b/api/ws/client.go
@@ -286,11 +286,13 @@ func (c *ClientWs) sender(p bool) error {
 				return err
 			}
 		case <-ticker.C:
+			c.mu[p].Lock()
 			if c.conn[p] != nil && (c.lastTransmit[p] == nil || (c.lastTransmit[p] != nil && time.Since(*c.lastTransmit[p]) > PingPeriod)) {
 				go func() {
 					c.sendChan[p] <- []byte("ping")
 				}()
 			}
+			c.mu[p].Unlock()
 		case <-c.ctx.Done():
 			return c.handleCancel("sender")
 		}

diff --git a/api/ws/public.go b/api/ws/public.go
@@ -269,7 +269,7 @@ func (c *Public) UOrderBook(req requests.OrderBook, rCh ...bool) error {
 	if len(rCh) > 0 && rCh[0] {
 		c.obCh = nil
 	}
-	return c.Unsubscribe(false, []okex.ChannelName{}, m)
+	return c.Unsubscribe(false, []okex.ChannelName{okex.ChannelName(req.Channel)}, m)
 }
 
 // OPTIONSummary

diff --git a/events/public/public_events.go b/events/public/public_events.go
@@ -44,8 +44,9 @@ type (
 		Limit []*publicdata.LimitPrice `json:"data"`
 	}
 	OrderBook struct {
-		Arg   *events.Argument      `json:"arg"`
-		Books []*market.OrderBookWs `json:"data"`
+		Arg    *events.Argument      `json:"arg"`
+		Books  []*market.OrderBookWs `json:"data"`
+		Action string                `json:"action"`
 	}
 	OPTIONSummary struct {
 		Arg     *events.Argument               `json:"arg"`