chore: drop use of noOpInMemoryCache

Author: mrstork

src/run/storage/request-scoped-in-memory-cache.cts

@@ -91,37 +91,18 @@ interface RequestScopedInMemoryCache {
   set(key: string, value: BlobType | null | Promise<BlobType | null>): void
 }
 
-const noOpInMemoryCache: RequestScopedInMemoryCache = {
-  get(): undefined {
-    // no-op
-  },
-  set() {
-    // no-op
-  },
-}
-
-export const getRequestSpecificInMemoryCache = (): RequestScopedInMemoryCache => {
+export const getRequestScopedInMemoryCache = (): RequestScopedInMemoryCache => {
   const requestContext = getRequestContext()
-  if (!requestContext) {
-    // Fallback to a no-op store if we can't find request context
-    return noOpInMemoryCache
-  }
-
   const inMemoryLRUCache = getInMemoryLRUCache()
-  if (inMemoryLRUCache === null) {
-    return noOpInMemoryCache
-  }
 
   return {
     get(key) {
-      const inMemoryValue = inMemoryLRUCache.get(`${requestContext.requestID}:${key}`)
-      if (inMemoryValue === NullValue) {
-        return null
-      }
-      return inMemoryValue
-    },
+      if (!requestContext) return
+      const value = inMemoryLRUCache?.get(`${requestContext.requestID}:${key}`)
+      return (value === NullValue) ? null : value
+    }, 
     set(key, value) {
-      inMemoryLRUCache.set(`${requestContext.requestID}:${key}`, value ?? NullValue)
-    },
+      inMemoryLRUCache?.set(`${requestContext?.requestID}:${key}`, value ?? NullValue)
+    }
   }
-}
+}

src/run/storage/storage.cts

@@ -7,7 +7,7 @@ import { type BlobType } from '../../shared/blob-types.cjs'
 import { getTracer } from '../handlers/tracer.cjs'
 
 import { getRegionalBlobStore } from './regional-blob-store.cjs'
-import { getRequestSpecificInMemoryCache } from './request-scoped-in-memory-cache.cjs'
+import { getRequestScopedInMemoryCache } from './request-scoped-in-memory-cache.cjs'
 
 const encodeBlobKey = async (key: string) => {
   const { encodeBlobKey: encodeBlobKeyImpl } = await import('../../shared/blobkey.js')
@@ -22,7 +22,7 @@ export const getMemoizedKeyValueStoreBackedByRegionalBlobStore = (
 
   return {
     async get<T extends BlobType>(key: string, otelSpanTitle: string): Promise<T | null> {
-      const inMemoryCache = getRequestSpecificInMemoryCache()
+      const inMemoryCache = getRequestScopedInMemoryCache()
 
       const memoizedValue = inMemoryCache.get(key)
       if (typeof memoizedValue !== 'undefined') {
@@ -41,7 +41,7 @@ export const getMemoizedKeyValueStoreBackedByRegionalBlobStore = (
       return getPromise
     },
     async set(key: string, value: BlobType, otelSpanTitle: string) {
-      const inMemoryCache = getRequestSpecificInMemoryCache()
+      const inMemoryCache = getRequestScopedInMemoryCache()
 
       inMemoryCache.set(key, value)