Skip to content
Merged
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
3 changes: 2 additions & 1 deletion server/api/registry/badge/[...pkg].get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export default defineCachedEventHandler(
async event => {
const pkgParamSegments = getRouterParam(event, 'pkg')?.split('/') ?? []
if (pkgParamSegments.length === 0) {
throw createError({ statusCode: 400, message: 'Package name is required.' })
// TODO: throwing 404 rather than 400 as it's cacheable
throw createError({ statusCode: 404, message: 'Package name is required.' })
}

const { rawPackageName, rawVersion } = parsePackageParams(pkgParamSegments)
Expand Down
6 changes: 4 additions & 2 deletions server/api/registry/docs/[...pkg].get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ export default defineCachedEventHandler(
async event => {
const pkgParam = getRouterParam(event, 'pkg')
if (!pkgParam) {
throw createError({ statusCode: 400, message: 'Package name is required' })
// TODO: throwing 404 rather than 400 as it's cacheable
throw createError({ statusCode: 404, message: 'Package name is required' })
}

const { packageName, version: requestedVersion } = parsePackageParam(pkgParam)

if (!packageName) {
throw createError({ statusCode: 400, message: 'Package name is required' })
// TODO: throwing 404 rather than 400 as it's cacheable
throw createError({ statusCode: 404, message: 'Package name is required' })
}
assertValidPackageName(packageName)

Expand Down
3 changes: 2 additions & 1 deletion server/api/registry/file/[...pkg].get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ export default defineCachedEventHandler(

if (versionSegments.length < 2) {
throw createError({
statusCode: 400,
// TODO: throwing 404 rather than 400 as it's cacheable
statusCode: 404,
message: ERROR_PACKAGE_VERSION_AND_FILE_FAILED,
})
}
Expand Down
6 changes: 4 additions & 2 deletions server/api/registry/org/[org]/packages.get.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ const NPM_ORG_NAME_RE = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/i
function validateOrgName(name: string): void {
if (!name || name.length > 50 || !NPM_ORG_NAME_RE.test(name)) {
throw createError({
statusCode: 400,
// TODO: throwing 404 rather than 400 as it's cacheable
statusCode: 404,
message: `Invalid org name: ${name}`,
})
}
Expand All @@ -20,7 +21,8 @@ export default defineCachedEventHandler(

if (!org) {
throw createError({
statusCode: 400,
// TODO: throwing 404 rather than 400 as it's cacheable
statusCode: 404,
message: 'Org name is required',
})
}
Expand Down
3 changes: 2 additions & 1 deletion server/utils/error-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export function handleApiError(error: unknown, fallback: ErrorOptions): never {
// Handle Valibot validation errors
if (v.isValiError(error)) {
throw createError({
statusCode: 400,
// TODO: throwing 404 rather than 400 as it's cacheable
statusCode: 404,
message: error.issues[0].message,
})
}
Expand Down
3 changes: 2 additions & 1 deletion shared/utils/npm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ export function assertValidPackageName(name: string): void {
if (!result.validForNewPackages && !result.validForOldPackages) {
const errors = [...(result.errors ?? []), ...(result.warnings ?? [])]
throw createError({
statusCode: 400,
// TODO: throwing 404 rather than 400 as it's cacheable
statusCode: 404,
message: `Invalid package name: ${errors[0] ?? 'unknown error'}`,
})
}
Expand Down
Loading