upgrade cachified (#618)

Co-authored-by: Kent C. Dodds <[email protected]>

app/utils/cache.server.ts

@@ -1,12 +1,14 @@
 import fs from 'fs'
 import {
 	cachified as baseCachified,
-	lruCacheAdapter,
 	verboseReporter,
 	mergeReporters,
 	type CacheEntry,
 	type Cache as CachifiedCache,
 	type CachifiedOptions,
+	type Cache,
+	totalTtl,
+	type CreateReporter,
 } from '@epic-web/cachified'
 import { remember } from '@epic-web/remember'
 import Database from 'better-sqlite3'
@@ -52,7 +54,19 @@ const lru = remember(
 	() => new LRUCache<string, CacheEntry<unknown>>({ max: 5000 }),
 )
 
-export const lruCache = lruCacheAdapter(lru)
+export const lruCache = {
+	name: 'app-memory-cache',
+	set: (key, value) => {
+		const ttl = totalTtl(value?.metadata)
+		lru.set(key, value, {
+			ttl: ttl === Infinity ? undefined : ttl,
+			start: value?.metadata?.createdTime,
+		})
+		return value
+	},
+	get: key => lru.get(key),
+	delete: key => lru.delete(key),
+} satisfies Cache
 
 const cacheEntrySchema = z.object({
 	metadata: z.object({
@@ -153,15 +167,17 @@ export async function searchCacheKeys(search: string, limit: number) {
 	}
 }
 
-export async function cachified<Value>({
-	timings,
-	reporter = verboseReporter(),
-	...options
-}: CachifiedOptions<Value> & {
-	timings?: Timings
-}): Promise<Value> {
-	return baseCachified({
-		...options,
-		reporter: mergeReporters(cachifiedTimingReporter(timings), reporter),
-	})
+export async function cachified<Value>(
+	{
+		timings,
+		...options
+	}: CachifiedOptions<Value> & {
+		timings?: Timings
+	},
+	reporter: CreateReporter<Value> = verboseReporter<Value>(),
+): Promise<Value> {
+	return baseCachified(
+		options,
+		mergeReporters(cachifiedTimingReporter(timings), reporter),
+	)
 }

package.json

@@ -42,7 +42,7 @@
   "dependencies": {
     "@conform-to/react": "^1.0.0",
     "@conform-to/zod": "^1.0.0",
-    "@epic-web/cachified": "^4.0.0",
+    "@epic-web/cachified": "^5.1.1",
     "@epic-web/client-hints": "^1.2.2",
     "@epic-web/invariant": "^1.0.0",
     "@epic-web/remember": "^1.0.2",