fix 24ticker empty symbol.Improve the weight list

Author: adrianceding

src/binance-proxy/handler/handler.go

@@ -16,11 +16,15 @@ func NewHandler(ctx context.Context, class service.Class, enableFakeKline bool)
 		class:           class,
 		enableFakeKline: enableFakeKline,
 	}
+	handler.ctx, handler.cancel = context.WithCancel(ctx)
 
 	return handler.Router
 }
 
 type Handler struct {
+	ctx    context.Context
+	cancel context.CancelFunc
+
 	class           service.Class
 	srv             *service.Service
 	enableFakeKline bool
@@ -48,6 +52,8 @@ func (s *Handler) Router(w http.ResponseWriter, r *http.Request) {
 func (s *Handler) reverseProxy(w http.ResponseWriter, r *http.Request) {
 	log.Debugf("%s reverse proxy.Path:%s", s.class, r.URL.RequestURI())
 
+	service.RateWait(s.ctx, s.class, r.Method, r.URL.Path, r.URL.Query())
+
 	var u *url.URL
 	if s.class == service.SPOT {
 		r.Host = "api.binance.com"
@@ -57,12 +63,6 @@ func (s *Handler) reverseProxy(w http.ResponseWriter, r *http.Request) {
 		u, _ = url.Parse("https://fapi.binance.com")
 	}
 
-	if s.class == service.SPOT {
-		service.SpotLimiter.WaitN(context.Background(), 1)
-	} else {
-		service.FuturesLimiter.WaitN(context.Background(), 5)
-	}
-
 	proxy := httputil.NewSingleHostReverseProxy(u)
 
 	proxy.ServeHTTP(w, r)

src/binance-proxy/handler/kline.go

@@ -20,7 +20,6 @@ func (s *Handler) klines(w http.ResponseWriter, r *http.Request) {
 	case err != nil, limitInt <= 0, limitInt > 1000,
 		r.URL.Query().Get("startTime") != "", r.URL.Query().Get("endTime") != "",
 		symbol == "", interval == "":
-
 		s.reverseProxy(w, r)
 		return
 	}

src/binance-proxy/handler/ticker.go

@@ -8,6 +8,10 @@ import (
 func (s *Handler) ticker(w http.ResponseWriter, r *http.Request) {
 	symbol := r.URL.Query().Get("symbol")
 
+	if symbol == "" {
+		s.reverseProxy(w, r)
+		return
+	}
 	ticker := s.srv.Ticker(symbol)
 	if ticker == nil {
 		s.reverseProxy(w, r)

src/binance-proxy/service/exchangeinfo.go

@@ -79,10 +79,10 @@ func (s *ExchangeInfoSrv) refreshExchangeInfo() error {
 	var url string
 	if s.si.Class == SPOT {
 		url = "https://api.binance.com/api/v3/exchangeInfo"
-		SpotLimiter.WaitN(s.ctx, 1)
+		RateWait(s.ctx, s.si.Class, http.MethodGet, "/api/v3/exchangeInfo", nil)
 	} else {
 		url = "https://fapi.binance.com/fapi/v1/exchangeInfo"
-		FuturesLimiter.WaitN(s.ctx, 5)
+		RateWait(s.ctx, s.si.Class, http.MethodGet, "/fapi/v1/exchangeInfo", nil)
 	}
 
 	resp, err := http.Get(url)

src/binance-proxy/service/kline.go

@@ -4,6 +4,8 @@ import (
 	"binance-proxy/tool"
 	"container/list"
 	"context"
+	"net/http"
+	"net/url"
 	"sync"
 
 	log "github.com/sirupsen/logrus"
@@ -103,12 +105,16 @@ func (s *KlinesSrv) initKlineData() {
 	var err error
 	for d := tool.NewDelayIterator(); ; d.Delay() {
 		if s.si.Class == SPOT {
-			SpotLimiter.WaitN(s.ctx, 1)
+			RateWait(s.ctx, s.si.Class, http.MethodGet, "/api/v3/klines", url.Values{
+				"limit": []string{"1000"},
+			})
 			klines, err = spot.NewClient("", "").NewKlinesService().
 				Symbol(s.si.Symbol).Interval(s.si.Interval).Limit(1000).
 				Do(s.ctx)
 		} else {
-			FuturesLimiter.WaitN(s.ctx, 5)
+			RateWait(s.ctx, s.si.Class, http.MethodGet, "/fapi/v1/klines", url.Values{
+				"limit": []string{"1000"},
+			})
 			klines, err = futures.NewClient("", "").NewKlinesService().
 				Symbol(s.si.Symbol).Interval(s.si.Interval).Limit(1000).
 				Do(s.ctx)

src/binance-proxy/service/limiter.go

@@ -1,6 +1,76 @@
 package service
 
-import "golang.org/x/time/rate"
+import (
+	"context"
+	"net/http"
+	"net/url"
+	"strconv"
 
-var SpotLimiter = rate.NewLimiter(20, 1200)
-var FuturesLimiter = rate.NewLimiter(40, 2400)
+	"golang.org/x/time/rate"
+)
+
+var (
+	SpotLimiter    = rate.NewLimiter(20, 1200)
+	FuturesLimiter = rate.NewLimiter(40, 2400)
+)
+
+func RateWait(ctx context.Context, class Class, method, path string, query url.Values) {
+	weight := 1
+	switch path {
+	case "/fapi/v1/klines":
+		weight = 5
+		limitInt, _ := strconv.Atoi(query.Get("limit"))
+		if limitInt >= 1 && limitInt < 100 {
+			weight = 1
+		} else if limitInt >= 100 && limitInt < 500 {
+			weight = 2
+		} else if limitInt >= 500 && limitInt <= 1000 {
+			weight = 5
+		} else if limitInt > 1000 && limitInt <= 1500 {
+			weight = 10
+		}
+	case "/api/v3/depth":
+		limitInt, _ := strconv.Atoi(query.Get("limit"))
+		if limitInt >= 5 && limitInt <= 100 {
+			weight = 1
+		} else if limitInt >= 100 && limitInt < 500 {
+			weight = 2
+		} else if limitInt == 500 {
+			weight = 5
+		} else if limitInt == 1000 {
+			weight = 10
+		} else if limitInt == 5000 {
+			weight = 50
+		}
+	case "/fapi/v1/depth":
+		limitInt, _ := strconv.Atoi(query.Get("limit"))
+		if limitInt >= 5 && limitInt <= 50 {
+			weight = 2
+		} else if limitInt == 100 {
+			weight = 5
+		} else if limitInt == 500 {
+			weight = 10
+		} else if limitInt == 1000 {
+			weight = 20
+		}
+	case "/api/v3/ticker/24hr", "/fapi/v1/ticker/24hr":
+		if query.Get("symbol") == "" {
+			weight = 40
+		}
+	case "/api/v3/exchangeInfo", "/fapi/v1/exchangeInfo", "/api/v3/account", "/api/v3/myTrades":
+		weight = 10
+	case "/api/v3/order":
+		if method == http.MethodGet {
+			weight = 2
+		}
+	case "/fapi/v1/userTrades", "/fapi/v2/account":
+		weight = 5
+
+	}
+
+	if class == SPOT {
+		SpotLimiter.WaitN(ctx, weight)
+	} else {
+		FuturesLimiter.WaitN(ctx, weight)
+	}
+}