Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c115f13
feat: Phase 1 - Terminal reconnection foundation
blink-so[bot] Jul 1, 2025
c10349b
fix: Improve useRetry hook logic
blink-so[bot] Jul 1, 2025
3f45b74
fix: Complete useRetry hook implementation and tests
blink-so[bot] Jul 1, 2025
834b2e5
style: Apply biome formatting fixes to useRetry hook
blink-so[bot] Jul 1, 2025
d398265
fix: Use window.setTimeout/setInterval for browser compatibility
blink-so[bot] Jul 1, 2025
dd7adda
refactor: consolidate useRetry state with useReducer
blink-so[bot] Jul 1, 2025
5766fc0
Reset TerminalPage files to main branch state
blink-so[bot] Jul 2, 2025
b1e453b
Add useWithRetry hook for simplified retry functionality
blink-so[bot] Jul 2, 2025
d4326fb
Clean up useWithRetry hook implementation
blink-so[bot] Jul 2, 2025
8323192
Remove useRetry hook and replace with useWithRetry
blink-so[bot] Jul 2, 2025
3022566
Refactor useWithRetry hook according to specifications
blink-so[bot] Jul 2, 2025
bde014c
Preserve attemptCount when max attempts reached
blink-so[bot] Jul 2, 2025
cb363db
Fix formatting
BrunoQuaresma Jul 2, 2025
55036a4
Fix hook and tests
BrunoQuaresma Jul 2, 2025
000f0e4
feat(hooks): remove max attempts limit from useWithRetry hook
BrunoQuaresma Jul 3, 2025
f9832c0
refactor(hooks): remove attemptCount from useWithRetry state and rena…
BrunoQuaresma Jul 3, 2025
4fd4885
fix(hooks): update useWithRetry tests for nextRetryAt API and add use…
BrunoQuaresma Jul 3, 2025
7b14acd
fix(hooks): prevent race condition in useWithRetry after unmount
BrunoQuaresma Jul 3, 2025
323f6ba
Fix formatting
BrunoQuaresma Jul 3, 2025
062bfa5
fix(hooks): prevent duplicate calls to useWithRetry while loading
BrunoQuaresma Jul 3, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor(hooks): remove attemptCount from useWithRetry state and rena…
…me retryAt to nextRetryAt

- Remove attemptCount from RetryState interface as it's not needed externally
- Rename retryAt to nextRetryAt for better clarity
- Simplify all setState calls to only manage isLoading and nextRetryAt
- Keep attempt tracking local to executeAttempt function for delay calculation

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
  • Loading branch information
BrunoQuaresma and claude committed Jul 3, 2025
commit f9832c0fb9d5a9993c3786ab7f88fd1883788686
29 changes: 16 additions & 13 deletions site/src/hooks/useWithRetry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ const MULTIPLIER = 2;

interface UseWithRetryResult {
call: () => Promise<void>;
retryAt: Date | undefined;
nextRetryAt: Date | undefined;
isLoading: boolean;
}

interface RetryState {
isLoading: boolean;
retryAt: Date | undefined;
attemptCount: number;
nextRetryAt: Date | undefined;
}

/**
Expand All @@ -25,8 +24,7 @@ interface RetryState {
export function useWithRetry(fn: () => Promise<void>): UseWithRetryResult {
const [state, setState] = useState<RetryState>({
isLoading: false,
retryAt: undefined,
attemptCount: 0,
nextRetryAt: undefined,
});

const timeoutRef = useRef<number | null>(null);
Expand All @@ -42,25 +40,30 @@ export function useWithRetry(fn: () => Promise<void>): UseWithRetryResult {
clearTimeout();

const executeAttempt = async (attempt: number): Promise<void> => {
setState((prev) => ({ ...prev, isLoading: true, attemptCount: attempt }));
setState({
isLoading: true,
nextRetryAt: undefined,
});

try {
await fn();
setState({ isLoading: false, retryAt: undefined, attemptCount: 0 });
setState({ isLoading: false, nextRetryAt: undefined });
} catch (error) {
const delayMs = Math.min(
DELAY_MS * MULTIPLIER ** attempt,
MAX_DELAY_MS,
);

setState((prev) => ({
...prev,
setState({
isLoading: false,
retryAt: new Date(Date.now() + delayMs),
}));
nextRetryAt: new Date(Date.now() + delayMs),
});

timeoutRef.current = window.setTimeout(() => {
setState((prev) => ({ ...prev, retryAt: undefined }));
setState({
isLoading: false,
nextRetryAt: undefined,
});
executeAttempt(attempt + 1);
}, delayMs);
}
Expand All @@ -77,7 +80,7 @@ export function useWithRetry(fn: () => Promise<void>): UseWithRetryResult {

return {
call,
retryAt: state.retryAt,
nextRetryAt: state.nextRetryAt,
isLoading: state.isLoading,
};
}