Skip to content

fix(cli): throw Error on timeout aborts #37

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

Open
zats wants to merge 2 commits into
base: main
Choose a base branch
from
+49 −40
Open

fix(cli): throw Error on timeout aborts #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f500c73
fix(cli): throw Error on timeout aborts
zats Jan 26, 2026
8665d44
fix(http): wrap fetch calls in try-finally to prevent timer leaks
zats Jan 26, 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
2 changes: 1 addition & 1 deletion e2e/clawdhub.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ async function makeTempConfig(registry: string, token: string | null) {

async function fetchWithTimeout(input: RequestInfo | URL, init?: RequestInit) {
const controller = new AbortController()
const timeout = setTimeout(() => controller.abort('Timeout'), REQUEST_TIMEOUT_MS)
const timeout = setTimeout(() => controller.abort(new Error('Timeout')), REQUEST_TIMEOUT_MS)
try {
return await fetch(input, { ...init, signal: controller.signal })
} finally {
Expand Down
87 changes: 48 additions & 39 deletions packages/clawdhub/src/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,26 @@ export async function apiRequest<T>(
body = JSON.stringify(args.body ?? {})
}
const controller = new AbortController()
const timeout = setTimeout(() => controller.abort('Timeout'), REQUEST_TIMEOUT_MS)
const response = await fetch(url, {
method: args.method,
headers,
body,
signal: controller.signal,
})
clearTimeout(timeout)
if (!response.ok) {
const text = await response.text().catch(() => '')
const message = text || `HTTP ${response.status}`
if (response.status === 429 || response.status >= 500) {
throw new Error(message)
const timeout = setTimeout(() => controller.abort(new Error('Timeout')), REQUEST_TIMEOUT_MS)
try {
const response = await fetch(url, {
method: args.method,
headers,
body,
signal: controller.signal,
})
if (!response.ok) {
const text = await response.text().catch(() => '')
const message = text || `HTTP ${response.status}`
if (response.status === 429 || response.status >= 500) {
throw new Error(message)
}
throw new AbortError(message)
}
throw new AbortError(message)
return (await response.json()) as unknown
} finally {
clearTimeout(timeout)
}
return (await response.json()) as unknown
},
{ retries: 2 },
)
Expand Down Expand Up @@ -103,23 +106,26 @@ export async function apiRequestForm<T>(
const headers: Record<string, string> = { Accept: 'application/json' }
if (args.token) headers.Authorization = `Bearer ${args.token}`
const controller = new AbortController()
const timeout = setTimeout(() => controller.abort('Timeout'), REQUEST_TIMEOUT_MS)
const response = await fetch(url, {
method: args.method,
headers,
body: args.form,
signal: controller.signal,
})
clearTimeout(timeout)
if (!response.ok) {
const text = await response.text().catch(() => '')
const message = text || `HTTP ${response.status}`
if (response.status === 429 || response.status >= 500) {
throw new Error(message)
const timeout = setTimeout(() => controller.abort(new Error('Timeout')), REQUEST_TIMEOUT_MS)
try {
const response = await fetch(url, {
method: args.method,
headers,
body: args.form,
signal: controller.signal,
})
if (!response.ok) {
const text = await response.text().catch(() => '')
const message = text || `HTTP ${response.status}`
if (response.status === 429 || response.status >= 500) {
throw new Error(message)
}
throw new AbortError(message)
}
throw new AbortError(message)
return (await response.json()) as unknown
} finally {
clearTimeout(timeout)
}
return (await response.json()) as unknown
},
{ retries: 2 },
)
Expand All @@ -138,17 +144,20 @@ export async function downloadZip(registry: string, args: { slug: string; versio
}

const controller = new AbortController()
const timeout = setTimeout(() => controller.abort('Timeout'), REQUEST_TIMEOUT_MS)
const response = await fetch(url.toString(), { method: 'GET', signal: controller.signal })
clearTimeout(timeout)
if (!response.ok) {
const message = (await response.text().catch(() => '')) || `HTTP ${response.status}`
if (response.status === 429 || response.status >= 500) {
throw new Error(message)
const timeout = setTimeout(() => controller.abort(new Error('Timeout')), REQUEST_TIMEOUT_MS)
try {
const response = await fetch(url.toString(), { method: 'GET', signal: controller.signal })
if (!response.ok) {
const message = (await response.text().catch(() => '')) || `HTTP ${response.status}`
if (response.status === 429 || response.status >= 500) {
throw new Error(message)
}
throw new AbortError(message)
}
throw new AbortError(message)
return new Uint8Array(await response.arrayBuffer())
} finally {
clearTimeout(timeout)
}
return new Uint8Array(await response.arrayBuffer())
},
{ retries: 2 },
)
Expand Down