Skip to content

fix(storage-vercel-blob): add response.ok check and downloadUrl fallback in staticHandler (#16186) #16188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deepshekhardas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(storage-vercel-blob): add response.ok check and downloadUrl fallback in staticHandler (#16186) #16188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions packages/storage-vercel-blob/src/staticHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,32 @@ export const getStaticHandler = (
},
})

if (!response.ok || !response.body) {
// If CDN fetch fails, try downloadUrl from head() as fallback
let finalResponse = response
if (!response.ok) {
const fallbackResponse = await fetch(blobMetadata.downloadUrl, {
headers: {
'Cache-Control': 'no-store, no-cache, must-revalidate',
Pragma: 'no-cache',
...(rangeResult.type === 'partial' && {
Range: `bytes=${rangeResult.rangeStart}-${rangeResult.rangeEnd}`,
}),
},
})
if (fallbackResponse.ok) {
finalResponse = fallbackResponse
} else {
return new Response(null, { status: 502, statusText: 'Bad Gateway' })
}
}

if (!finalResponse.body) {
return new Response(null, { status: 204, statusText: 'No Content' })
}

headers.append('Last-Modified', uploadedAtString)

return new Response(response.body, {
return new Response(finalResponse.body, {
headers,
status: rangeResult.status,
})
Expand Down
Loading