Merge branch 'master' of github.com:tomochain/tomox-sdk

ws/connection.go

@@ -11,8 +11,8 @@ import (
 )
 
 const (
-	writeWait  = 60 * time.Second
-	pongWait   = 60 * time.Second
+	writeWait  = 30 * time.Second
+	pongWait   = 30 * time.Second
 	pingPeriod = (pongWait * 9) / 10
 )
 

ws/lending_markets.go

@@ -98,11 +98,16 @@ func (s *LendingMarketsSocket) Unsubscribe(c *Client) {
 	}
 }
 
-// BroadcastMessage streams message to all the subscriptions subscribed to the pair
-func (s *LendingMarketsSocket) BroadcastMessage(channelID string, p interface{}) error {
+func (s *LendingMarketsSocket) getSubscriptions() map[string]map[*Client]bool {
 	s.subsMutex.RLock()
 	defer s.subsMutex.RUnlock()
-	for c, status := range s.subscriptions[channelID] {
+	return s.subscriptions
+}
+
+// BroadcastMessage streams message to all the subscriptions subscribed to the pair
+func (s *LendingMarketsSocket) BroadcastMessage(channelID string, p interface{}) error {
+	subs := s.getSubscriptions()
+	for c, status := range subs[channelID] {
 		if status {
 			s.SendUpdateMessage(c, p)
 		}

ws/lending_orderbook.go

@@ -101,11 +101,16 @@ func (s *LendingOrderBookSocket) Unsubscribe(c *Client) {
 	}
 }
 
-// BroadcastMessage streams message to all the subscribtions subscribed to the pair
-func (s *LendingOrderBookSocket) BroadcastMessage(channelID string, p interface{}) error {
+func (s *LendingOrderBookSocket) getSubscriptions() map[string]map[*Client]bool {
 	s.subsMutex.RLock()
 	defer s.subsMutex.RUnlock()
-	for c, status := range s.subscriptions[channelID] {
+	return s.subscriptions
+}
+
+// BroadcastMessage streams message to all the subscribtions subscribed to the pair
+func (s *LendingOrderBookSocket) BroadcastMessage(channelID string, p interface{}) error {
+	subs := s.getSubscriptions()
+	for c, status := range subs[channelID] {
 		if status {
 			s.SendUpdateMessage(c, p)
 		}

ws/lending_priceboard.go

@@ -94,11 +94,16 @@ func (s *LendingPriceBoardSocket) Unsubscribe(c *Client) {
 	}
 }
 
-// BroadcastMessage streams message to all the subscriptions subscribed to the pair
-func (s *LendingPriceBoardSocket) BroadcastMessage(channelID string, p interface{}) error {
+func (s *LendingPriceBoardSocket) getSubscriptions() map[string]map[*Client]bool {
 	s.subsMutex.RLock()
 	defer s.subsMutex.RUnlock()
-	for c, status := range s.subscriptions[channelID] {
+	return s.subscriptions
+}
+
+// BroadcastMessage streams message to all the subscriptions subscribed to the pair
+func (s *LendingPriceBoardSocket) BroadcastMessage(channelID string, p interface{}) error {
+	subs := s.getSubscriptions()
+	for c, status := range subs[channelID] {
 		if status {
 			s.SendUpdateMessage(c, p)
 		}

ws/lending_trade.go

@@ -97,12 +97,17 @@ func (s *LendingTradeSocket) Unsubscribe(c *Client) {
 	}
 }
 
+func (s *LendingTradeSocket) getSubscriptions() map[string]map[*Client]bool {
+	s.subsMutex.RLock()
+	defer s.subsMutex.RUnlock()
+	return lendingTradeSocket.subscriptions
+}
+
 // BroadcastMessage broadcasts trade message to all subscribed sockets
 func (s *LendingTradeSocket) BroadcastMessage(channelID string, p interface{}) {
 	go func() {
-		s.subsMutex.RLock()
-		defer s.subsMutex.RUnlock()
-		for conn, active := range lendingTradeSocket.subscriptions[channelID] {
+		subs := s.getSubscriptions()
+		for conn, active := range subs[channelID] {
 			if active {
 				s.SendUpdateMessage(conn, p)
 			}

ws/markets.go

@@ -96,11 +96,16 @@ func (s *MarketsSocket) Unsubscribe(c *Client) {
 	}
 }
 
-// BroadcastMessage streams message to all the subscriptions subscribed to the pair
-func (s *MarketsSocket) BroadcastMessage(channelID string, p interface{}) error {
+func (s *MarketsSocket) getSubscriptions() map[string]map[*Client]bool {
 	s.subsMutex.RLock()
 	defer s.subsMutex.RUnlock()
-	for c, status := range s.subscriptions[channelID] {
+	return s.subscriptions
+}
+
+// BroadcastMessage streams message to all the subscriptions subscribed to the pair
+func (s *MarketsSocket) BroadcastMessage(channelID string, p interface{}) error {
+	subs := s.getSubscriptions()
+	for c, status := range subs[channelID] {
 		if status {
 			s.SendUpdateMessage(c, p)
 		}

ws/orderbook.go

@@ -98,11 +98,16 @@ func (s *OrderBookSocket) Unsubscribe(c *Client) {
 	}
 }
 
-// BroadcastMessage streams message to all the subscribtions subscribed to the pair
-func (s *OrderBookSocket) BroadcastMessage(channelID string, p interface{}) error {
+func (s *OrderBookSocket) getSubscriptions() map[string]map[*Client]bool {
 	s.subsMutex.RLock()
 	defer s.subsMutex.RUnlock()
-	for c, status := range s.subscriptions[channelID] {
+	return s.subscriptions
+}
+
+// BroadcastMessage streams message to all the subscribtions subscribed to the pair
+func (s *OrderBookSocket) BroadcastMessage(channelID string, p interface{}) error {
+	subs := s.getSubscriptions()
+	for c, status := range subs[channelID] {
 		if status {
 			s.SendUpdateMessage(c, p)
 		}

ws/price_board.go

@@ -95,11 +95,16 @@ func (s *PriceBoardSocket) Unsubscribe(c *Client) {
 	}
 }
 
-// BroadcastMessage streams message to all the subscriptions subscribed to the pair
-func (s *PriceBoardSocket) BroadcastMessage(channelID string, p interface{}) error {
+func (s *PriceBoardSocket) getSubscriptions() map[string]map[*Client]bool {
 	s.subsMutex.RLock()
 	defer s.subsMutex.RUnlock()
-	for c, status := range s.subscriptions[channelID] {
+	return s.subscriptions
+}
+
+// BroadcastMessage streams message to all the subscriptions subscribed to the pair
+func (s *PriceBoardSocket) BroadcastMessage(channelID string, p interface{}) error {
+	subs := s.getSubscriptions()
+	for c, status := range subs[channelID] {
 		if status {
 			s.SendUpdateMessage(c, p)
 		}

ws/trades.go

@@ -93,12 +93,17 @@ func (s *TradeSocket) Unsubscribe(c *Client) {
 	}
 }
 
+func (s *TradeSocket) getSubscriptions() map[string]map[*Client]bool {
+	s.subsMutex.RLock()
+	defer s.subsMutex.RUnlock()
+	return tradeSocket.subscriptions
+}
+
 // BroadcastMessage broadcasts trade message to all subscribed sockets
 func (s *TradeSocket) BroadcastMessage(channelID string, p interface{}) {
 	go func() {
-		s.subsMutex.RLock()
-		defer s.subsMutex.RUnlock()
-		for conn, active := range tradeSocket.subscriptions[channelID] {
+		subs := s.getSubscriptions()
+		for conn, active := range subs[channelID] {
 			if active {
 				s.SendUpdateMessage(conn, p)
 			}