Skip to content

perf: use $fetch.raw instead fetch with separate controller + timeout #485

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
danielroe merged 6 commits into from
Jan 31, 2026
+16 −19
Merged

perf: use $fetch.raw instead fetch with separate controller + timeout #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
31ae154
perf: use `$fetch` timeout instead separate controller + timeout
OrbisK Jan 31, 2026
397c8a5
Merge branch 'main' into perf/ofetch-timeout
OrbisK Jan 31, 2026
decdba6
fix: use `_data` instead of `text()`
OrbisK Jan 31, 2026
e8a9a1c
Merge branch 'main' into perf/ofetch-timeout
OrbisK Jan 31, 2026
82711f7
fix: extract text from blob
OrbisK Jan 31, 2026
f636f6f
Merge branch 'main' into perf/ofetch-timeout
OrbisK Jan 31, 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 server/api/contributors.get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default defineCachedEventHandler(
{
headers: {
'Accept': 'application/vnd.github.v3+json',
'User-Agent': 'npmx.dev',
'User-Agent': 'npmx',
Copy link
Copy Markdown
Contributor Author

@OrbisK OrbisK Jan 31, 2026

Choose a reason for hiding this comment

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

every other user-agent is npmx not npmx.dev

},
},
)
Expand Down
33 changes: 15 additions & 18 deletions server/utils/docs/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ function createLoader(): (
let url: URL
try {
url = new URL(specifier)
} catch {
} catch (e) {
// eslint-disable-next-line no-console
console.error(e)
return undefined
}

Expand All @@ -93,21 +95,18 @@ function createLoader(): (
return undefined
}

const controller = new AbortController()
const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS)

try {
const response = await fetch(url.toString(), {
const response = await $fetch.raw<Blob>(url.toString(), {
method: 'GET',
timeout: FETCH_TIMEOUT_MS,
redirect: 'follow',
signal: controller.signal,
})
clearTimeout(timeoutId)

if (response.status !== 200) {
return undefined
}

const content = await response.text()
const content = (await response._data?.text()) ?? ''
const headers: Record<string, string> = {}
for (const [key, value] of response.headers) {
headers[key.toLowerCase()] = value
Expand All @@ -119,8 +118,9 @@ function createLoader(): (
headers,
content,
}
} catch {
clearTimeout(timeoutId)
} catch (e) {
// eslint-disable-next-line no-console
console.error(e)
return undefined
}
}
Expand Down Expand Up @@ -161,18 +161,15 @@ function createResolver(): (specifier: string, referrer: string) => string {
async function getTypesUrl(packageName: string, version: string): Promise<string | null> {
const url = `https://esm.sh/${packageName}@${version}`

const controller = new AbortController()
const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS)

try {
const response = await fetch(url, {
const response = await $fetch.raw(url, {
method: 'HEAD',
signal: controller.signal,
timeout: FETCH_TIMEOUT_MS,
})
clearTimeout(timeoutId)
return response.headers.get('x-typescript-types')
} catch {
clearTimeout(timeoutId)
} catch (e) {
// eslint-disable-next-line no-console
console.error(e)
return null
}
}
Loading