Unverified Commit 21e44116 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix dangling promise in unstable-cache (#79248)

While investigating an issue with intermittent `unstable_cache` calls
failing to set noticed we have these dangling promises which cause
"racey" behavior with setting to a cache in environments where the
function stops after the request is finished.

These have been present since
https://github.com/vercel/next.js/commit/b305c2d309b4d4923c3b11f7e258077729ab28fb
altho since racey may or may not have been noticed.

x-ref: [slack
thread](https://vercel.slack.com/archives/C02K2HCH5V4/p1747322956802819?thread_ts=1746633220.634939&cid=C02K2HCH5V4)
parent 733e4d64
---
'next': patch
---
Fix dangling promise in unstable_cache
...@@ -275,7 +275,14 @@ export function unstable_cache<T extends Callback>( ...@@ -275,7 +275,14 @@ export function unstable_cache<T extends Callback>(
) )
if (!workStore.isDraftMode) { if (!workStore.isDraftMode) {
cacheNewResult( if (!workStore.pendingRevalidates) {
workStore.pendingRevalidates = {}
}
// We need to push the cache result promise to pending
// revalidates otherwise it won't be awaited and is just
// dangling
workStore.pendingRevalidates[invocationKey] = cacheNewResult(
result, result,
incrementalCache, incrementalCache,
cacheKey, cacheKey,
...@@ -330,7 +337,11 @@ export function unstable_cache<T extends Callback>( ...@@ -330,7 +337,11 @@ export function unstable_cache<T extends Callback>(
cb, cb,
...args ...args
) )
cacheNewResult(
// we need to wait setting the new cache result here as
// we don't have pending revalidates on workStore to
// push to and we can't have a dangling promise
await cacheNewResult(
result, result,
incrementalCache, incrementalCache,
cacheKey, cacheKey,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment