Update xhttp retry

src/xutil/xhttp/request_test.go

@@ -79,17 +79,20 @@ func TestDebugAndAbortRetry(t *testing.T) {
 	url := "https://aaaaa.com/"
 	retryIf := func(resp *xhttp.XResponse, err error) error {
 		if err != nil {
+			if count == 1 {
+				return err
+			}
 			return errors.Join(err, xhttp.ErrAbortRetry)
 		}
 		if resp.StatusCode != 200 {
 			return fmt.Errorf("invalid status_code: %d", resp.StatusCode)
 		}
 		return nil
 	}
-	resp, err := xhttp.Request("GET", url, xhttp.WithRetry(retryIf, retry.Attempts(2)))
+	resp, err := xhttp.Request("GET", url, xhttp.WithRetry(retryIf, retry.Attempts(3)))
 
 	a.Nil(resp)
 	a.NotNil(err)
 	a.Contains(err.Error(), "xhttp: abort further retries")
-	a.Equal(count, 1)
+	a.Equal(count, 2)
 }

src/xutil/xhttp/retry.go

@@ -12,15 +12,17 @@ type RetryIfFunc func(*XResponse, error) error
 func doRetry(opts *requestOptions, f func() (*XResponse, error)) (*XResponse, error) {
 	var resp *XResponse
 	var err error
-	var lastErr error
+	var errorLog []error
 	err = retry.Do(
 		func() error {
 			resp, err = f()
 			if opts.RetryIfFunc != nil {
 				err := opts.RetryIfFunc(resp, err)
-				if err != nil && errors.Is(err, ErrAbortRetry) {
-					lastErr = err
-					return nil
+				if err != nil {
+					errorLog = append(errorLog, err)
+					if errors.Is(err, ErrAbortRetry) {
+						return nil
+					}
 				}
 				return err
 			}
@@ -34,8 +36,8 @@ func doRetry(opts *requestOptions, f func() (*XResponse, error)) (*XResponse, er
 	if err != nil {
 		return nil, err
 	}
-	if lastErr != nil {
-		return nil, lastErr
+	if len(errorLog) > 0 {
+		return nil, errors.Join(errorLog...)
 	}
 	return resp, nil
 }