fix: Complete useRetry hook implementation and tests

blink-so[bot] · BrunoQuaresma · blink-so[bot] · commit 3f45b74cbf8c · 2025-07-01T14:43:23.000Z
- Fix attemptCount to represent attempts started, not completed
- Fix exponential backoff delay calculation
- Fix retry scheduling conditions for proper max attempts handling
- All 10 useRetry tests now pass
- No regressions in existing test suite

Implements correct behavior:
- attemptCount increments when retry starts
- Exponential backoff: 1s, 2s, 4s, 8s, 16s, 30s (capped)
- Respects maxAttempts limit
- Manual retry cancels automatic retries
- State resets properly on success

Co-authored-by: BrunoQuaresma &lt;3165839+BrunoQuaresma@users.noreply.github.com&gt;
diff --git a/site/src/hooks/useRetry.ts b/site/src/hooks/useRetry.ts
@@ -99,6 +99,8 @@ export function useRetry(options: UseRetryOptions): UseRetryReturn {
 		setTimeUntilNextRetry(null);
 		setCurrentDelay(null);
 		clearTimers();
+		// Increment attempt count when starting the retry
+		setAttemptCount(prev => prev + 1);
 
 		try {
 			await onRetryEvent();
@@ -107,21 +109,20 @@ export function useRetry(options: UseRetryOptions): UseRetryReturn {
 			setIsRetrying(false);
 			setIsManualRetry(false);
 		} catch (error) {
-			// If retry fails, schedule next attempt (if not manual and under max attempts)
-			setAttemptCount((prev) => prev + 1);
+			// If retry fails, just update state (attemptCount already incremented)
 			setIsRetrying(false);
 			setIsManualRetry(false);
 		}
 	}, [onRetryEvent, clearTimers]);
 
 	const scheduleNextRetry = useCallback(
 		(attempt: number) => {
-			if (attempt >= maxAttempts) {
+			if (attempt > maxAttempts) {
 				return;
 			}
 
-			// Calculate delay based on attempt - 2 (so second attempt gets initialDelay)
-		const delay = calculateDelay(Math.max(0, attempt - 2));
+			// Calculate delay based on attempt - 1 (so first retry gets initialDelay)
+		const delay = calculateDelay(Math.max(0, attempt - 1));
 			setCurrentDelay(delay);
 			setTimeUntilNextRetry(delay);
 			startTimeRef.current = Date.now();
@@ -155,8 +156,8 @@ export function useRetry(options: UseRetryOptions): UseRetryReturn {
 		if (
 			!isRetrying &&
 			!isManualRetry &&
-			attemptCount > 1 &&
-			attemptCount <= maxAttempts
+			attemptCount > 0 &&
+			attemptCount < maxAttempts
 		) {
 			scheduleNextRetry(attemptCount);
 		}
@@ -172,7 +173,6 @@ export function useRetry(options: UseRetryOptions): UseRetryReturn {
 
 	const startRetrying = useCallback(() => {
 		// Immediately perform the first retry attempt
-		setAttemptCount(1);
 		performRetry();
 	}, [performRetry]);
 
