refactor: unify atproto caches

Author: danielroe

modules/cache.ts

@@ -30,11 +30,7 @@ export default defineNuxtModule({
 
       const env = process.env.VERCEL_ENV
 
-      nitroConfig.storage['oauth-atproto-state'] = {
-        driver: env === 'production' ? 'vercel-kv' : 'vercel-runtime-cache',
-      }
-
-      nitroConfig.storage['oauth-atproto-session'] = {
+      nitroConfig.storage.atproto = {
         driver: env === 'production' ? 'vercel-kv' : 'vercel-runtime-cache',
       }
     })

nuxt.config.ts

@@ -152,17 +152,9 @@ export default defineNuxtConfig({
         driver: 'fsLite',
         base: './.cache/fetch',
       },
-      'oauth-atproto-state': {
+      'atproto': {
         driver: 'fsLite',
-        base: './.cache/atproto-oauth/state',
-      },
-      'oauth-atproto-session': {
-        driver: 'fsLite',
-        base: './.cache/atproto-oauth/session',
-      },
-      'generic-cache': {
-        driver: 'fsLite',
-        base: './.cache/generic',
+        base: './.cache/atproto',
       },
     },
     typescript: {

server/utils/atproto/oauth-session-store.ts

@@ -4,7 +4,7 @@ import type { H3Event } from 'h3'
 /**
  * Storage key prefix for oauth session storage.
  */
-export const OAUTH_SESSION_CACHE_STORAGE_BASE = 'oauth-atproto-session'
+export const OAUTH_SESSION_CACHE_STORAGE_BASE = 'atproto:oauth-session'
 
 export class OAuthSessionStore implements NodeSavedSessionStore {
   // TODO: not sure if we will support multi accounts, but if we do in the future will need to change this around

server/utils/atproto/oauth-state-store.ts

@@ -4,7 +4,7 @@ import type { H3Event } from 'h3'
 /**
  * Storage key prefix for oauth state storage.
  */
-export const OAUTH_STATE_CACHE_STORAGE_BASE = 'oauth-atproto-state'
+export const OAUTH_STATE_CACHE_STORAGE_BASE = 'atproto:oauth-state'
 
 export class OAuthStateStore implements NodeSavedStateStore {
   private readonly cookieKey = 'oauth:atproto:state'

server/utils/cache/local.ts

@@ -23,7 +23,7 @@ function isCacheEntryStale(entry: LocalCachedEntry): boolean {
  * Local implmentation of a cache to be used during development
  */
 export class LocalCacheAdapter implements CacheAdapter {
-  private readonly storage = useStorage('generic-cache')
+  private readonly storage = useStorage('atproto:generic')
 
   async get<T>(key: string): Promise<T | undefined> {
     const result = await this.storage.getItem<LocalCachedEntry<T>>(key)