feat: improve retry behavior on context deadline

client_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/lithic-com/lithic-go/option"
 )
 
-func TestCancel(t *testing.T) {
+func TestContextCancel(t *testing.T) {
 	client := lithic.NewClient(
 		option.WithBaseURL("http://127.0.0.1:4010"),
 		option.WithAPIKey("APIKey"),
@@ -28,14 +28,15 @@ func TestCancel(t *testing.T) {
 	}
 }
 
+// neverTransport never completes a request and waits for the Context to be done.
 type neverTransport struct{}
 
 func (t *neverTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	<-req.Context().Done()
 	return nil, fmt.Errorf("cancelled")
 }
 
-func TestCancelDelay(t *testing.T) {
+func TestContextCancelDelay(t *testing.T) {
 	client := lithic.NewClient(
 		option.WithBaseURL("http://127.0.0.1:4010"),
 		option.WithAPIKey("APIKey"),
@@ -50,6 +51,41 @@ func TestCancelDelay(t *testing.T) {
 		Type: lithic.F(lithic.CardNewParamsTypeSingleUse),
 	})
 	if err == nil || res != nil {
-		t.Error("Expected there to be a cancel error and for the response to be nil")
+		t.Error("expected there to be a cancel error and for the response to be nil")
+	}
+}
+
+func TestContextDeadline(t *testing.T) {
+	testTimeout := time.After(3 * time.Second)
+	testDone := make(chan bool)
+
+	deadline := time.Now().Add(100 * time.Millisecond)
+	deadlineCtx, cancel := context.WithDeadline(context.Background(), deadline)
+	defer cancel()
+
+	go func() {
+		client := lithic.NewClient(
+			option.WithBaseURL("http://127.0.0.1:4010"),
+			option.WithAPIKey("APIKey"),
+			option.WithHTTPClient(&http.Client{Transport: &neverTransport{}}),
+		)
+		res, err := client.Cards.New(deadlineCtx, lithic.CardNewParams{
+			Type: lithic.F(lithic.CardNewParamsTypeSingleUse),
+		})
+		if err == nil || res != nil {
+			t.Error("expected there to be a deadline error and for the response to be nil")
+		}
+		testDone <- true
+	}()
+
+	select {
+	case <-testTimeout:
+		t.Fatal("client didn't finish in time")
+	case <-testDone:
+		diff := time.Now().Sub(deadline)
+		if diff < -20*time.Millisecond || 20*time.Millisecond < diff {
+			t.Logf("error difference: %v", diff)
+			t.Fatal("client did not return within 20ms of context deadline")
+		}
 	}
 }

internal/requestconfig/requestconfig.go

@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"math"
@@ -228,8 +227,8 @@ func (cfg *RequestConfig) Execute() (err error) {
 		}
 
 		res, err = handler(cfg.Request.Clone(ctx))
-		if errors.Is(err, context.Canceled) {
-			return err
+		if ctx != nil && ctx.Err() != nil {
+			return ctx.Err()
 		}
 		if !shouldRetry(cfg.Request, res) || retryCount >= cfg.MaxRetries {
 			break