Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"@iconscout/react-unicons": "^1.1.6",
"@internxt/css-config": "1.1.0",
"@internxt/lib": "1.4.1",
"@internxt/sdk": "=1.12.0",
"@internxt/sdk": "=1.12.2",
"@internxt/ui": "0.1.1",
"@phosphor-icons/react": "^2.1.7",
"@popperjs/core": "^2.11.6",
Expand Down
1 change: 1 addition & 0 deletions src/app/core/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ export const HTTP_CODES = {
MAX_SPACE_USED: 420,
FORBIDDEN: 403,
NOT_FOUND: 404,
TOO_MANY_REQUESTS: 429,
};
export enum ErrorMessages {
ServerUnavailable = 'Server Unavailable',
Expand Down
4 changes: 3 additions & 1 deletion src/app/i18n/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,9 @@
"copy-to-clipboard": "Link in die Zwischenablage kopiert",
"link-updated": "Linkeinstellungen aktualisiert",
"link-deleted": "Link gelöscht",
"links-deleted": "Link(s) gelöscht"
"links-deleted": "Link(s) gelöscht",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems that here is missing error-deleting-links translation, can you add it? :)

"error-deleting-links": "Fehler beim Löschen der Links",
"rate-limit-retry": "Dies dauert länger als erwartet. Bitte warten..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,8 @@
"link-updated": "Link settings updated",
"link-deleted": "Link deleted",
"links-deleted": "Link(s) deleted",
"error-deleting-links": "An error occurred deleting links"
"error-deleting-links": "An error occurred deleting links",
"rate-limit-retry": "This is taking longer than expected. Please wait..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1212,7 +1212,8 @@
"link-updated": "Link settings updated",
"link-deleted": "Enlace eliminado",
"links-deleted": "Enlaces eliminados",
"error-deleting-links": "Se produjo un error al eliminar enlaces compartidos"
"error-deleting-links": "Se produjo un error al eliminar enlaces compartidos",
"rate-limit-retry": "Esto está tardando más de lo esperado. Por favor, espera..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,8 @@
"link-updated": "Mise à jour des paramètres de lien",
"link-deleted": "Lien supprimé",
"links-deleted": "Lien(s) supprimé",
"error-deleting-links": "Une erreur s'est produite lors de la suppression des liens partagés"
"error-deleting-links": "Une erreur s'est produite lors de la suppression des liens partagés",
"rate-limit-retry": "Cela prend plus de temps que prévu. Veuillez patienter..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,8 @@
"link-updated": "Impostazioni di collegamento aggiornate",
"link-deleted": "Link rimosso",
"links-deleted": "Link(s) rimossi",
"error-deleting-links": "Si è verificato un errore durante l'eliminazione dei link condivisi"
"error-deleting-links": "Si è verificato un errore durante l'eliminazione dei link condivisi",
"rate-limit-retry": "Ci sta mettendo più tempo del previsto. Attendere prego..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,8 @@
"link-updated": "Настройки ссылки обновлены",
"link-deleted": "Ссылка удалена",
"links-deleted": "Ссылка(и) удалена(ы)",
"error-deleting-links": "Возникла ошибка при удалении общих ссылок"
"error-deleting-links": "Возникла ошибка при удалении общих ссылок",
"rate-limit-retry": "Это занимает больше времени, чем ожидалось. Пожалуйста, подождите..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -1165,7 +1165,8 @@
"link-updated": "鏈接設置已更新",
"link-deleted": "鏈接已刪除",
"links-deleted": "鏈接已刪除",
"error-deleting-links": "刪除鏈接時出錯"
"error-deleting-links": "刪除鏈接時出錯",
"rate-limit-retry": "這比預期的時間要長。請稍候..."
}
},
"trash": {
Expand Down
3 changes: 2 additions & 1 deletion src/app/i18n/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,8 @@
"link-updated": "链接设置已更新",
"link-deleted": "链接已删除",
"links-deleted": "链接已删除",
"error-deleting-links": "删除共享链接时发生错误"
"error-deleting-links": "删除共享链接时发生错误",
"rate-limit-retry": "这比预期的时间要长。请稍候..."
}
},
"trash": {
Expand Down
104 changes: 104 additions & 0 deletions src/app/network/retry-with-rate-limit.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { retryWithBackoff } from './retry-with-rate-limit';
import * as timeUtils from 'utils/timeUtils';

vi.mock('utils/timeUtils', () => ({
wait: vi.fn(() => Promise.resolve()),
}));

const createRateLimitError = (resetDelay: string, additionalHeaders?: Record<string, string>) => ({
status: 429,
headers: { 'x-internxt-ratelimit-reset': resetDelay, ...additionalHeaders },
});

const createRateLimitMock = (resetDelay: string, additionalHeaders?: Record<string, string>) =>
vi.fn().mockRejectedValueOnce(createRateLimitError(resetDelay, additionalHeaders)).mockResolvedValueOnce('success');

describe('retryWithBackoff', () => {
beforeEach(() => {
vi.clearAllMocks();
});

it('when function succeeds immediately then returns result without retry', async () => {
const mockFn = vi.fn().mockResolvedValue('success');

const result = await retryWithBackoff(mockFn);

expect(result).toBe('success');
expect(mockFn).toHaveBeenCalledTimes(1);
expect(timeUtils.wait).not.toHaveBeenCalled();
});

it('when rate limited then retries with delay from headers', async () => {
const mockFn = createRateLimitMock('5000');

const result = await retryWithBackoff(mockFn);

expect(result).toBe('success');
expect(mockFn).toHaveBeenCalledTimes(2);
expect(timeUtils.wait).toHaveBeenCalledWith(5000);
});

it('when error is not rate limit then throws immediately without retry', async () => {
const mockFn = vi.fn().mockRejectedValue({ status: 500, message: 'Internal Server Error' });

await expect(retryWithBackoff(mockFn)).rejects.toEqual({ status: 500, message: 'Internal Server Error' });

expect(mockFn).toHaveBeenCalledTimes(1);
expect(timeUtils.wait).not.toHaveBeenCalled();
});

it('when rate limited multiple times then calls onRetry for each retry', async () => {
const error = createRateLimitError('1000');
const mockFn = vi.fn().mockRejectedValueOnce(error).mockRejectedValueOnce(error).mockResolvedValueOnce('success');

const onRetry = vi.fn();

const result = await retryWithBackoff(mockFn, { onRetry });

expect(result).toBe('success');
expect(mockFn).toHaveBeenCalledTimes(3);
expect(onRetry).toHaveBeenCalledTimes(2);
expect(onRetry).toHaveBeenNthCalledWith(1, 1, 1000);
expect(onRetry).toHaveBeenNthCalledWith(2, 2, 1000);
});

it('when headers missing or invalid then throws error', async () => {
const testCases = [
{ status: 429 },
{ status: 429, headers: {} },
{ status: 429, headers: { 'x-internxt-ratelimit-reset': 'invalid' } },
];

for (const error of testCases) {
const mockFn = vi.fn().mockRejectedValue(error);
await expect(retryWithBackoff(mockFn)).rejects.toEqual(error);
expect(mockFn).toHaveBeenCalledTimes(1);
vi.clearAllMocks();
}
});

it('when max retries exceeded then throws original error', async () => {
const error = new Error('Rate limit exceeded');
Object.assign(error, { status: 429, headers: { 'x-internxt-ratelimit-reset': '1000' } });
const mockFn = vi.fn().mockRejectedValue(error);

await expect(retryWithBackoff(mockFn, { maxRetries: 2 })).rejects.toThrow('Rate limit exceeded');

expect(mockFn).toHaveBeenCalledTimes(3);
expect(timeUtils.wait).toHaveBeenCalledTimes(2);
});

it('when error is not an object then throws immediately without retry', async () => {
const testCases = ['string error', null];

for (const error of testCases) {
const mockFn = vi.fn().mockRejectedValue(error);
await expect(retryWithBackoff(mockFn)).rejects.toBe(error);
expect(mockFn).toHaveBeenCalledTimes(1);
vi.clearAllMocks();
}

expect(timeUtils.wait).not.toHaveBeenCalled();
});
});
79 changes: 79 additions & 0 deletions src/app/network/retry-with-rate-limit.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import { wait } from 'utils/timeUtils';
import { HTTP_CODES } from 'app/core/constants';

export interface RetryOptions {
maxRetries?: number;
onRetry?: (attempt: number, delay: number) => void;
}

interface ErrorWithStatus {
status?: number;
headers?: Record<string, string>;
}

const isErrorWithStatus = (error: unknown): error is ErrorWithStatus => {
return typeof error === 'object' && error !== null;
};

const isRateLimitError = (error: unknown): boolean => {
if (!isErrorWithStatus(error)) {
return false;
}
return error.status === HTTP_CODES.TOO_MANY_REQUESTS;
};

const extractRetryAfter = (error: ErrorWithStatus): number | undefined => {
const headers = error.headers;
const resetHeader = headers?.['x-internxt-ratelimit-reset'];
if (!resetHeader) {
return undefined;
}

const resetValueMs = Number.parseInt(resetHeader, 10);
if (Number.isNaN(resetValueMs)) {
return undefined;
}

return resetValueMs;
};

/**
* Retries a function when it encounters a rate limit error (429).
* Uses the retry-after value from the x-internxt-ratelimit-reset header to wait before retrying.
*
* @param fn - The async function to execute with retry logic
* @param options - Configuration options for retry behavior
* @param options.maxRetries - Maximum number of retry attempts (default: 5)
* @param options.onRetry - Optional callback invoked before each retry with attempt number and retry after value
* @returns The result of the function if successful
* @throws The original error if it's not a rate limit error, if max retries exceeded, or if rate limit headers are missing
*/
export const retryWithBackoff = async <T>(fn: () => Promise<T>, options: RetryOptions = {}): Promise<T> => {
const opts = {
maxRetries: 5,
onRetry: () => {},
...options,
};

for (let attempt = 0; attempt < opts.maxRetries; attempt++) {
try {
return await fn();
} catch (error: unknown) {
if (!isRateLimitError(error)) {
throw error;
}

const retryAfter = extractRetryAfter(error as ErrorWithStatus);

if (!retryAfter) {
throw error;
}

opts.onRetry(attempt + 1, retryAfter);

await wait(retryAfter);
}
}

return await fn();
};
Loading
Loading