Skip to content

Add configurable request timeout to ApiClient #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeFiVC merged 2 commits into from
Sep 2, 2026
Merged

Add configurable request timeout to ApiClient #406

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4529ab
fix(api): add configurable request timeout to ApiClient (#301)
CollinsKRO Aug 31, 2026
3fc19d6
Merge branch 'main' into fix/add-api-request-timeout
CollinsKRO Sep 2, 2026
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
37 changes: 23 additions & 14 deletions src/lib/api/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useErrorStore } from "@/store/error-store";

const BASE_URL = process.env.NEXT_PUBLIC_API_URL || "http://localhost:3001/api";

const REQUEST_TIMEOUT_MS = 15000;
const REQUEST_TIMEOUT_MS = 30_000;
const RETRY_BASE_DELAY_MS = 1000;
const MAX_RETRIES = 3;

Expand Down Expand Up @@ -151,15 +151,16 @@ class ApiClient {
url: string,
init: RequestInit,
retries: number,
signal?: AbortSignal
signal?: AbortSignal,
timeout: number = REQUEST_TIMEOUT_MS
): Promise<Response> {
for (let attempt = 0; ; attempt++) {
if (signal?.aborted) {
throw createAbortError();
}

const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
const timeoutId = setTimeout(() => controller.abort(), timeout);
const onExternalAbort = () => controller.abort();
signal?.addEventListener("abort", onExternalAbort);

Expand Down Expand Up @@ -248,7 +249,7 @@ class ApiClient {
path: string,
jwt?: string,
signal?: AbortSignal,
options?: { bypassCache?: boolean }
options?: { bypassCache?: boolean; timeout?: number }
): Promise<ApiResponse<T>> {
const url = `${this.baseUrl}${path}`;
const key = this.cacheKey(url, jwt);
Expand All @@ -267,7 +268,7 @@ class ApiClient {
// A `bypassCache` read is deliberately never shared: the caller wants its
// own fresh round-trip and owns cancellation directly.
if (options?.bypassCache) {
return this.executeGet<T>(url, key, jwt, true, signal);
return this.executeGet<T>(url, key, jwt, true, signal, options?.timeout);
}

let entry = inFlightGets.get(key);
Expand All @@ -277,7 +278,7 @@ class ApiClient {
controller,
refs: 0,
settled: false,
promise: this.executeGet<T>(url, key, jwt, false, controller.signal),
promise: this.executeGet<T>(url, key, jwt, false, controller.signal, options?.timeout),
};
const settle = () => {
created.settled = true;
Expand Down Expand Up @@ -307,14 +308,16 @@ class ApiClient {
key: string,
jwt: string | undefined,
bypassCache: boolean,
signal?: AbortSignal
signal?: AbortSignal,
timeout?: number
): Promise<ApiResponse<T>> {
try {
const response = await this.fetchWithRetry(
url,
{ method: "GET", headers: this.getHeaders(jwt) },
MAX_RETRIES,
signal
signal,
timeout
);
const data = await this.handleResponse<ApiResponse<T>>(response);
if (!bypassCache) {
Expand All @@ -333,7 +336,8 @@ class ApiClient {
path: string,
body: unknown,
jwt?: string,
signal?: AbortSignal
signal?: AbortSignal,
timeout?: number
): Promise<ApiResponse<T>> {
try {
const response = await this.fetchWithRetry(
Expand All @@ -344,7 +348,8 @@ class ApiClient {
body: JSON.stringify(body),
},
0,
signal
signal,
timeout
);
const data = await this.handleResponse<ApiResponse<T>>(response);
this.invalidateCache();
Expand All @@ -361,7 +366,8 @@ class ApiClient {
path: string,
body: unknown,
jwt?: string,
signal?: AbortSignal
signal?: AbortSignal,
timeout?: number
): Promise<ApiResponse<T>> {
try {
const response = await this.fetchWithRetry(
Expand All @@ -372,7 +378,8 @@ class ApiClient {
body: JSON.stringify(body),
},
0,
signal
signal,
timeout
);
const data = await this.handleResponse<ApiResponse<T>>(response);
this.invalidateCache();
Expand All @@ -388,14 +395,16 @@ class ApiClient {
async delete<T>(
path: string,
jwt?: string,
signal?: AbortSignal
signal?: AbortSignal,
timeout?: number
): Promise<ApiResponse<T>> {
try {
const response = await this.fetchWithRetry(
`${this.baseUrl}${path}`,
{ method: "DELETE", headers: this.getHeaders(jwt) },
0,
signal
signal,
timeout
);
const data = await this.handleResponse<ApiResponse<T>>(response);
this.invalidateCache();
Expand Down