fix: follow contributing guidelines

Author: Gugustinette

server/api/gravatar.get.ts

@@ -1,7 +1,9 @@
 import type { H3Event } from 'h3'
-import { CACHE_MAX_AGE_ONE_DAY } from '#shared/utils/constants'
+import { createError, getQuery } from 'h3'
+import * as v from 'valibot'
+import { GravatarQuerySchema } from '#shared/schemas/user'
 import { getGravatarFromUsername } from '#server/utils/gravatar'
-import { assertValidUsername } from '#shared/utils/npm'
+import { handleApiError } from '#server/utils/error-handler'
 
 function getQueryParam(event: H3Event, key: string): string {
   const query = getQuery(event)
@@ -11,30 +13,31 @@ function getQueryParam(event: H3Event, key: string): string {
 
 export default defineCachedEventHandler(
   async event => {
-    const username = getQueryParam(event, 'username').trim()
+    const rawUsername = getQueryParam(event, 'username')
+    const rawSize = getQueryParam(event, 'size')
 
-    if (!username) {
-      throw createError({
-        statusCode: 400,
-        message: 'Username is required',
+    try {
+      const { username, size } = v.parse(GravatarQuerySchema, {
+        username: rawUsername,
+        size: rawSize ? rawSize : undefined,
       })
-    }
-
-    assertValidUsername(username)
 
-    const sizeParam = Number.parseInt(getQueryParam(event, 'size'), 10)
-    const size = Number.isNaN(sizeParam) ? 80 : Math.max(16, Math.min(512, sizeParam))
+      const url = await getGravatarFromUsername(username, size ?? 80)
 
-    const url = await getGravatarFromUsername(username, size)
+      if (!url) {
+        throw createError({
+          statusCode: 404,
+          message: ERROR_GRAVATAR_EMAIL_UNAVAILABLE,
+        })
+      }
 
-    if (!url) {
-      throw createError({
-        statusCode: 400,
-        message: "User's email not accessible",
+      return { url }
+    } catch (error: unknown) {
+      handleApiError(error, {
+        statusCode: 502,
+        message: ERROR_GRAVATAR_FETCH_FAILED,
       })
     }
-
-    return { url }
   },
   {
     maxAge: CACHE_MAX_AGE_ONE_DAY,

server/utils/npm.ts

@@ -122,6 +122,6 @@ export const fetchUserEmail = defineCachedFunction(
     maxAge: CACHE_MAX_AGE_ONE_DAY,
     swr: true,
     name: 'npm-user-email',
-    getKey: (username: string) => `npm-user-email:${username.toLowerCase()}`,
+    getKey: (username: string) => `npm-user-email:${username.trim().toLowerCase()}`,
   },
 )

shared/schemas/user.ts

@@ -0,0 +1,43 @@
+import * as v from 'valibot'
+
+const NPM_USERNAME_RE = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/i
+const NPM_USERNAME_MAX_LENGTH = 50
+
+/**
+ * Schema for npm usernames.
+ */
+export const NpmUsernameSchema = v.pipe(
+  v.string(),
+  v.trim(),
+  v.nonEmpty('Username is required'),
+  v.maxLength(NPM_USERNAME_MAX_LENGTH, 'Username is too long'),
+  v.regex(NPM_USERNAME_RE, 'Invalid username format'),
+)
+
+/**
+ * Schema for Gravatar query inputs.
+ */
+export const GravatarQuerySchema = v.object({
+  username: NpmUsernameSchema,
+  size: v.optional(
+    v.pipe(
+      v.union([v.number(), v.string()]),
+      v.transform(value => {
+        if (typeof value === 'string') {
+          const trimmed = value.trim()
+          return /^\d+$/.test(trimmed) ? Number(trimmed) : Number.NaN
+        }
+        return value
+      }),
+      v.check(value => !Number.isNaN(value), 'Invalid size'),
+      v.number(),
+      v.minValue(16),
+      v.maxValue(512),
+    ),
+  ),
+})
+
+/** @public */
+export type NpmUsername = v.InferOutput<typeof NpmUsernameSchema>
+/** @public */
+export type GravatarQuery = v.InferOutput<typeof GravatarQuerySchema>

shared/utils/constants.ts

@@ -19,6 +19,8 @@ export const ERROR_NPM_FETCH_FAILED = 'Failed to fetch package from npm registry
 export const UNSET_NUXT_SESSION_PASSWORD = 'NUXT_SESSION_PASSWORD not set'
 /** @public */
 export const ERROR_SUGGESTIONS_FETCH_FAILED = 'Failed to fetch suggestions.'
+export const ERROR_GRAVATAR_FETCH_FAILED = 'Failed to fetch Gravatar profile.'
+export const ERROR_GRAVATAR_EMAIL_UNAVAILABLE = "User's email not accessible."
 
 // microcosm services
 export const CONSTELLATION_HOST = 'constellation.microcosm.blue'