Hotfix

pkg/http/client.go

@@ -2,33 +2,34 @@ package http
 
 import (
 	"context"
+	"math"
 	"net"
 	"net/http"
 	"strings"
 	"time"
 
 	"github.com/debridmediamanager.com/zurg/internal/config"
-	"github.com/debridmediamanager.com/zurg/pkg/logutil"
 	cmap "github.com/orcaman/concurrent-map/v2"
 	"go.uber.org/zap"
 )
 
 type HTTPClient struct {
-	Client          *http.Client
-	MaxRetries      int
-	Backoff         func(attempt int) time.Duration
-	CheckRespStatus func(resp *http.Response, err error) bool
-	BearerToken     string
-	log             *zap.SugaredLogger
-	config          config.ConfigInterface
-	IPv6            cmap.ConcurrentMap[string, net.IP]
+	Client      *http.Client
+	MaxRetries  int
+	Backoff     func(attempt int) time.Duration
+	ShouldRetry func(resp *http.Response, err error) int
+	BearerToken string
+	log         *zap.SugaredLogger
+	config      config.ConfigInterface
+	IPv6        cmap.ConcurrentMap[string, net.IP]
 }
 
 func (r *HTTPClient) Do(req *http.Request) (*http.Response, error) {
+	req.Close = true
 	if r.config != nil && strings.Contains(req.Host, "download.real-debrid.") {
 		prefHost := r.config.GetRandomPreferredHost()
 		if prefHost != "" {
-			req.Host = prefHost
+			req.URL.Host = prefHost
 		}
 	}
 	if r.BearerToken != "" {
@@ -72,35 +73,57 @@ func (r *HTTPClient) Do(req *http.Request) (*http.Response, error) {
 
 	var resp *http.Response
 	var err error
-	for attempt := 0; attempt < r.MaxRetries; attempt++ {
+	attempt := 0
+	for {
 		resp, err = r.Client.Do(req)
-		if !r.CheckRespStatus(resp, err) {
+		if val := r.ShouldRetry(resp, err); val == -1 {
 			return resp, err
+		} else {
+			if val == 0 {
+				time.Sleep(8 * time.Second) // extra delay
+			} else {
+				attempt += val
+				if attempt > r.MaxRetries {
+					return resp, err
+				}
+				time.Sleep(r.Backoff(attempt))
+			}
 		}
-		time.Sleep(r.Backoff(attempt))
 	}
-	return resp, err
 }
 
-func NewHTTPClient(token string, maxRetries int, cfg config.ConfigInterface) *HTTPClient {
+func NewHTTPClient(token string, maxRetries int, timeoutSecs int, cfg config.ConfigInterface, log *zap.SugaredLogger) *HTTPClient {
 	return &HTTPClient{
 		BearerToken: token,
-		Client:      &http.Client{},
-		MaxRetries:  maxRetries,
+		Client: &http.Client{
+			Timeout: time.Duration(timeoutSecs) * time.Second,
+		},
+		MaxRetries: maxRetries,
 		Backoff: func(attempt int) time.Duration {
-			return time.Duration(attempt) * time.Second
-		},
-		CheckRespStatus: func(resp *http.Response, err error) bool {
-			if err != nil {
-				return true
+			maxDuration := 60
+			backoff := int(math.Pow(2, float64(attempt)))
+			if backoff > maxDuration {
+				backoff = maxDuration
 			}
-			if resp.StatusCode == 429 {
-				return true
-			}
-			// no need to retry)
-			return false
+			return time.Duration(backoff) * time.Second
 		},
-		log:    logutil.NewLogger().Named("client"),
+		ShouldRetry: func(resp *http.Response, err error) int {
+			if resp != nil {
+				if resp.StatusCode == 429 || resp.StatusCode == 400 {
+					return 0 // retry but don't increment attempt
+				}
+				return -1 // don't retry
+			} else if err != nil {
+				errStr := err.Error()
+				if strings.Contains(errStr, "EOF") || strings.Contains(errStr, "connection reset") || strings.Contains(errStr, "no such host") {
+					return 0 // retry but don't increment attempt
+				} else {
+					return 1
+				}
+			}
+			return 1 // retry and increment attempt
+		},
+		log:    log,
 		config: cfg,
 		IPv6:   cmap.New[net.IP](),
 	}