fix: separate server handlers

The inner data was ending up with cached params somehow so this seems to
solve that by caching the underlying full data set by itself.

Author: 43081j

server/api/registry/timeline/[...pkg].get.ts

@@ -1,18 +1,7 @@
-import { hasBuiltInTypes } from '~~/shared/utils/package-analysis'
+export type { TimelineVersion } from '~~/server/utils/timeline'
 
 const DEFAULT_LIMIT = 25
 
-export interface TimelineVersion {
-  version: string
-  time: string
-  license?: string
-  type?: string
-  hasTypes?: boolean
-  hasTrustedPublisher?: boolean
-  hasProvenance?: boolean
-  tags: string[]
-}
-
 export interface TimelineResponse {
   versions: TimelineVersion[]
   total: number
@@ -28,76 +17,34 @@ export interface TimelineResponse {
  * - /api/registry/timeline/packageName?offset=0&limit=25
  * - /api/registry/timeline/@scope/packageName?offset=0&limit=25
  */
-export default defineCachedEventHandler(
-  async event => {
-    const pkgParam = getRouterParam(event, 'pkg')
-    if (!pkgParam) {
-      throw createError({ statusCode: 404, message: 'Package name is required' })
-    }
-
-    let packageName: string
-    try {
-      packageName = decodeURIComponent(pkgParam)
-    } catch {
-      throw createError({ statusCode: 400, message: 'Invalid package name encoding' })
-    }
-
-    const query = getQuery(event)
-    const offset = Math.max(0, Number(query.offset) || 0)
-    const limit = Math.max(1, Math.min(100, Number(query.limit) || DEFAULT_LIMIT))
-
-    try {
-      const packument = await fetchNpmPackage(packageName)
-
-      const tagsByVersion = new Map<string, string[]>()
-      for (const [tag, ver] of Object.entries(packument['dist-tags'] ?? {})) {
-        const list = tagsByVersion.get(ver)
-        if (list) list.push(tag)
-        else tagsByVersion.set(ver, [tag])
-      }
-
-      // Build full sorted list
-      const allVersions = Object.keys(packument.versions)
-        .filter(v => packument.time[v])
-        .map(v => {
-          const version = packument.versions[v]!
-          let license = version.license
-          if (license && typeof license === 'object' && 'type' in license) {
-            license = (license as { type: string }).type
-          }
-
-          return {
-            version: v,
-            time: packument.time[v]!,
-            license: typeof license === 'string' ? license : undefined,
-            type: typeof version.type === 'string' ? version.type : undefined,
-            hasTypes: hasBuiltInTypes(version) || undefined,
-            hasTrustedPublisher: version._npmUser?.trustedPublisher ? true : undefined,
-            hasProvenance: version.dist?.attestations ? true : undefined,
-            tags: tagsByVersion.get(v) ?? [],
-          }
-        })
-        .sort((a, b) => Date.parse(b.time) - Date.parse(a.time))
-
-      return {
-        versions: allVersions.slice(offset, offset + limit),
-        total: allVersions.length,
-      } satisfies TimelineResponse
-    } catch (error: unknown) {
-      handleApiError(error, {
-        statusCode: 502,
-        message: `Failed to fetch timeline for ${packageName}`,
-      })
-    }
-  },
-  {
-    maxAge: CACHE_MAX_AGE_FIVE_MINUTES,
-    swr: true,
-    getKey: event => {
-      const query = getQuery(event)
-      const offset = Math.max(0, Number(query.offset) || 0)
-      const limit = Math.max(1, Math.min(100, Number(query.limit) || DEFAULT_LIMIT))
-      return `timeline:v1:${getRouterParam(event, 'pkg')}:${offset}:${limit}`
-    },
-  },
-)
+export default defineEventHandler(async event => {
+  const pkgParam = getRouterParam(event, 'pkg')
+  if (!pkgParam) {
+    throw createError({ statusCode: 404, message: 'Package name is required' })
+  }
+
+  let packageName: string
+  try {
+    packageName = decodeURIComponent(pkgParam)
+  } catch {
+    throw createError({ statusCode: 400, message: 'Invalid package name encoding' })
+  }
+
+  const query = getQuery(event)
+  const offset = Math.max(0, Number(query.offset) || 0)
+  const limit = Math.max(1, Math.min(100, Number(query.limit) || DEFAULT_LIMIT))
+
+  try {
+    const allVersions = await fetchTimeline(packageName)
+
+    return {
+      versions: allVersions.slice(offset, offset + limit),
+      total: allVersions.length,
+    } satisfies TimelineResponse
+  } catch (error: unknown) {
+    handleApiError(error, {
+      statusCode: 502,
+      message: `Failed to fetch timeline for ${packageName}`,
+    })
+  }
+})

server/utils/timeline.ts

@@ -0,0 +1,53 @@
+import { hasBuiltInTypes } from '~~/shared/utils/package-analysis'
+
+export interface TimelineVersion {
+  version: string
+  time: string
+  license?: string
+  type?: string
+  hasTypes?: boolean
+  hasTrustedPublisher?: boolean
+  hasProvenance?: boolean
+  tags: string[]
+}
+
+export const fetchTimeline = defineCachedFunction(
+  async (packageName: string): Promise<TimelineVersion[]> => {
+    const packument = await fetchNpmPackage(packageName)
+
+    const tagsByVersion = new Map<string, string[]>()
+    for (const [tag, ver] of Object.entries(packument['dist-tags'] ?? {})) {
+      const list = tagsByVersion.get(ver)
+      if (list) list.push(tag)
+      else tagsByVersion.set(ver, [tag])
+    }
+
+    return Object.keys(packument.versions)
+      .filter(v => packument.time[v])
+      .map(v => {
+        const version = packument.versions[v]!
+        let license = version.license
+        if (license && typeof license === 'object' && 'type' in license) {
+          license = (license as { type: string }).type
+        }
+
+        return {
+          version: v,
+          time: packument.time[v]!,
+          license: typeof license === 'string' ? license : undefined,
+          type: typeof version.type === 'string' ? version.type : undefined,
+          hasTypes: hasBuiltInTypes(version) || undefined,
+          hasTrustedPublisher: version._npmUser?.trustedPublisher ? true : undefined,
+          hasProvenance: version.dist?.attestations ? true : undefined,
+          tags: tagsByVersion.get(v) ?? [],
+        }
+      })
+      .sort((a, b) => Date.parse(b.time) - Date.parse(a.time))
+  },
+  {
+    maxAge: CACHE_MAX_AGE_FIVE_MINUTES,
+    swr: true,
+    name: 'timeline',
+    getKey: (packageName: string) => `timeline:v1:${packageName}`,
+  },
+)