Preserve attemptCount when max attempts reached

- Do not reset attemptCount when no more attempts are possible - Add attemptCount to UseWithRetryResult interface - Return attemptCount in hook result for tracking - Update tests to verify attemptCount preservation - Add comprehensive test for attemptCount behavior This allows consumers to track how many attempts were made, even after all retry attempts have been exhausted. Co-authored-by: BrunoQuaresma <3165839+BrunoQuaresma@users.noreply.github.com>
coder · BrunoQuaresma · Jul 3, 2025 · Jul 1, 2025 · Jul 1, 2025 · Jul 1, 2025
commit bde014c401d85755d0a79927b0b256f2dff67ca8
@@ -21,6 +21,7 @@ describe("useWithRetry", () => {
 
     expect(result.current.isLoading).toBe(false);
     expect(result.current.retryAt).toBe(null);
+    expect(result.current.attemptCount).toBe(0);
   });
 
   it("should execute function successfully on first attempt", async () => {
@@ -35,6 +36,7 @@ describe("useWithRetry", () => {
     expect(mockFn).toHaveBeenCalledTimes(1);
     expect(result.current.isLoading).toBe(false);
     expect(result.current.retryAt).toBe(null);
+    expect(result.current.attemptCount).toBe(0);
   });
 
   it("should set isLoading to true during execution", async () => {
@@ -122,6 +124,7 @@ describe("useWithRetry", () => {
     // After 10 attempts, should stop retrying
     expect(result.current.isLoading).toBe(false);
     expect(result.current.retryAt).toBe(null);
+    expect(result.current.attemptCount).toBe(10); // Should preserve final attempt count
   });
 
   it("should respect max delay of 10 minutes", async () => {
@@ -245,4 +248,38 @@ describe("useWithRetry", () => {
     // Function should not have been called again
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
+
+  it("should preserve attemptCount when max attempts reached", async () => {
+    mockFn.mockRejectedValue(new Error("Always fails"));
+
+    const { result } = renderHook(() => useWithRetry(mockFn));
+
+    // Start the call
+    await act(async () => {
+      await result.current.call();
+    });
+
+    expect(result.current.attemptCount).toBe(1);
+
+    // Fast-forward through 9 more retries to reach max attempts
+    for (let i = 1; i < 10; i++) {
+      const delay = Math.min(1000 * 2 ** (i - 1), 600000);
+      await act(async () => {
+        jest.advanceTimersByTime(delay);
+      });
+      expect(result.current.attemptCount).toBe(i + 1);
+    }
+
+    // After max attempts, attemptCount should be preserved
+    expect(result.current.attemptCount).toBe(10);
+    expect(result.current.isLoading).toBe(false);
+    expect(result.current.retryAt).toBe(null);
+
+    // Calling again should reset attemptCount
+    await act(async () => {
+      await result.current.call();
+    });
+
+    expect(result.current.attemptCount).toBe(1); // Reset on new call
+  });
 });
@@ -10,6 +10,7 @@ interface UseWithRetryResult {
   call: () => Promise<void>;
   retryAt: Date | null;
   isLoading: boolean;
+  attemptCount: number;
 }
 
 interface RetryState {
@@ -63,8 +64,8 @@ export function useWithRetry(fn: () => Promise<void>): UseWithRetryResult {
             executeAttempt(attempt + 1);
           }, delay);
         } else {
-          // No more attempts - reset state
-          setState({ isLoading: false, retryAt: null, attemptCount: 0 });
+          // No more attempts - keep attemptCount for tracking
+          setState(prev => ({ ...prev, isLoading: false, retryAt: null }));
         }
       }
     };
@@ -83,5 +84,6 @@ export function useWithRetry(fn: () => Promise<void>): UseWithRetryResult {
     call,
     retryAt: state.retryAt,
     isLoading: state.isLoading,
+    attemptCount: state.attemptCount,
   };
 }