refactor: extract createCachedFetch

Author: 9romise

src/constants.ts

@@ -6,5 +6,4 @@ export const PNPM_WORKSPACE_PATTERN = `**/${PNPM_WORKSPACE_BASENAME}`
 
 export const VERSION_TRIGGER_CHARACTERS = ['.', '^', '~', ...Array.from({ length: 10 }).map((_, i) => `${i}`)]
 
-export const NPM_REGISTRY = 'https://registry.npmjs.org'
-export const NPMX_DEV_API = 'https://npmx.dev/api'
+export const CACHE_TTL_ONE_DAY = 1000 * 60 * 60 * 24

src/providers/diagnostics/rules/replacement.ts

@@ -1,6 +1,6 @@
 import type { ModuleReplacement } from 'module-replacements'
 import type { DiagnosticRule } from '..'
-import { getReplacement } from '#utils/replacement'
+import { getReplacement } from '#utils/npmx'
 import { DiagnosticSeverity } from 'vscode'
 
 // https://github.com/npmx-dev/npmx.dev/blob/main/app/components/PackageReplacement.vue#L8-L30

src/utils/cache.ts

@@ -0,0 +1,29 @@
+import { CACHE_TTL_ONE_DAY } from '#constants'
+import { logger } from '#state'
+import { LRUCache } from 'lru-cache'
+
+export function createCachedFetch<T extends object>(
+  key: string,
+  fetchMethod: (name: string, staleValue: T | undefined, options: LRUCache.FetcherOptions<string, T, unknown>) => Promise<T | undefined>,
+) {
+  const cache = new LRUCache<string, T>({
+    max: 500,
+    ttl: CACHE_TTL_ONE_DAY,
+    updateAgeOnGet: true,
+    allowStale: true,
+    fetchMethod: async (name, staleValue, options) => {
+      try {
+        logger.info(`[${name}]: fetching ${key}...`)
+        const r = await fetchMethod(name, staleValue, options)
+        logger.info(`[${name}] fetching ${key} done!`)
+        return r
+      } catch (err) {
+        logger.warn(`[${name}] fetching ${key} error: `, err)
+      }
+    },
+  })
+
+  return async function getCache(name: string) {
+    return (await cache.fetch(name))!
+  }
+}

src/utils/npm.ts

@@ -1,8 +1,8 @@
 import type { Packument, PackumentVersion } from '@npm/types'
-import { NPM_REGISTRY } from '#constants'
-import { logger } from '#state'
-import { LRUCache } from 'lru-cache'
 import { ofetch } from 'ofetch'
+import { createCachedFetch } from './cache'
+
+const NPM_REGISTRY = 'https://registry.npmjs.org'
 
 interface ResolvedPackumentVersion extends Pick<PackumentVersion, 'version'> {
   tag?: string
@@ -25,46 +25,33 @@ export function encodePackageName(name: string): string {
   return encodeURIComponent(name)
 }
 
-const cache = new LRUCache<string, ResolvedPackument>({
-  max: 500,
-  ttl: 5 * 60 * 1000,
-  updateAgeOnGet: true,
-  allowStale: true,
-  fetchMethod: async (name, staleValue, { signal }) => {
+export const getPackageInfo = createCachedFetch<ResolvedPackument>(
+  'package info',
+  async (name, staleValue, { signal }) => {
     const encodedName = encodePackageName(name)
 
-    try {
-      logger.info(`[${name}] fetching package info...`)
-      const pkg = await ofetch<Packument>(`${NPM_REGISTRY}/${encodedName}`, { signal })
-      logger.info(`[${name}] fetching package info done!`)
-
-      const resolvedVersions = Object.fromEntries(
-        Object.keys(pkg.versions)
-          .filter((v) => pkg.time[v])
-          .map<[string, ResolvedPackumentVersion]>((v) => [
-            v,
-            {
-              version: v,
-              // @ts-expect-error present if published with provenance
-              hasProvenance: !!pkg.versions[v].dist.attestations,
-              deprecated: pkg.versions[v].deprecated,
-            },
-          ]),
-      )
-
-      Object.entries(pkg['dist-tags']).forEach(([tag, version]) => {
-        resolvedVersions[version].tag = tag
-      })
-
-      return {
-        versions: resolvedVersions,
-      }
-    } catch (err) {
-      logger.warn(`[${name}] fetching package info error: `, err)
+    const pkg = await ofetch<Packument>(`${NPM_REGISTRY}/${encodedName}`, { signal })
+
+    const resolvedVersions = Object.fromEntries(
+      Object.keys(pkg.versions)
+        .filter((v) => pkg.time[v])
+        .map<[string, ResolvedPackumentVersion]>((v) => [
+          v,
+          {
+            version: v,
+            // @ts-expect-error present if published with provenance
+            hasProvenance: !!pkg.versions[v].dist.attestations,
+            deprecated: pkg.versions[v].deprecated,
+          },
+        ]),
+    )
+
+    Object.entries(pkg['dist-tags']).forEach(([tag, version]) => {
+      resolvedVersions[version].tag = tag
+    })
+
+    return {
+      versions: resolvedVersions,
     }
   },
-})
-
-export async function getPackageInfo(name: string) {
-  return (await cache.fetch(name))!
-}
+)

src/utils/npmx.ts

@@ -0,0 +1,17 @@
+import type { ModuleReplacement } from 'module-replacements'
+import { ofetch } from 'ofetch'
+import { createCachedFetch } from './cache'
+import { encodePackageName } from './npm'
+
+export const NPMX_DEV_API = 'https://npmx.dev/api'
+
+export const getReplacement = createCachedFetch<ModuleReplacement>(
+  'replacement',
+  (name, staleValue, { signal }) => {
+    const encodedName = encodePackageName(name)
+
+    return ofetch<ModuleReplacement>(`${NPMX_DEV_API}/replacements/${encodedName}`, { signal })
+      // Fallback for cache compatibility (LRUCache rejects null/undefined)
+      ?? {}
+  },
+)