Merge pull request #339 from mniehe/mn-check-context

fix: Cancel retry if the request failed due to a cancelled context

client_test.go

@@ -5,9 +5,6 @@ import (
 	"context"
 	"crypto/tls"
 	"errors"
-	"github.com/imroc/req/v3/internal/header"
-	"github.com/imroc/req/v3/internal/tests"
-	"golang.org/x/net/publicsuffix"
 	"io"
 	"net"
 	"net/http"
@@ -17,8 +14,27 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/imroc/req/v3/internal/header"
+	"github.com/imroc/req/v3/internal/tests"
+	"golang.org/x/net/publicsuffix"
 )
 
+func TestRetryCancelledContext(t *testing.T) {
+	cancelledCtx, done := context.WithCancel(context.Background())
+	done()
+
+	client := tc().
+		SetCommonRetryCount(2).
+		SetCommonRetryBackoffInterval(1*time.Second, 5*time.Second)
+
+	res, err := client.R().SetContext(cancelledCtx).Get("/")
+
+	tests.AssertEqual(t, 0, res.Request.RetryAttempt)
+	tests.AssertNotNil(t, err)
+	tests.AssertErrorContains(t, err, "context canceled")
+}
+
 func TestWrapRoundTrip(t *testing.T) {
 	i, j, a, b := 0, 0, 0, 0
 	c := tc().WrapRoundTripFunc(func(rt RoundTripper) RoundTripFunc {

request.go

@@ -661,13 +661,17 @@ func (r *Request) do() (resp *Response, err error) {
 			resp, err = r.client.roundTrip(r)
 		}
 
+		// Determine if the error is from a cancelled context. Store it here so it doesn't get lost
+		// when processing the AfterRespon middleware.
+		contextCanceled := errors.Is(err, context.Canceled)
+
 		for _, f := range r.afterResponse {
 			if err = f(r.client, resp); err != nil {
 				return
 			}
 		}
 
-		if r.retryOption == nil || (r.RetryAttempt >= r.retryOption.MaxRetries && r.retryOption.MaxRetries >= 0) { // absolutely cannot retry.
+		if contextCanceled || r.retryOption == nil || (r.RetryAttempt >= r.retryOption.MaxRetries && r.retryOption.MaxRetries >= 0) { // absolutely cannot retry.
 			return
 		}