Skip to content

fix(start): throw on aborted bot SSR render instead of silently returning 200 #7930

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
mixelburg wants to merge 2 commits into
base: main
Choose a base branch
from
+10 −15
Open

fix(start): throw on aborted bot SSR render instead of silently returning 200 #7930

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eac07bd
fix(start): throw on aborted bot SSR render instead of returning 200
mixelburg Jul 31, 2026
f053e56
fix(solid-router): update SSR abort test to expect rejection
mixelburg Aug 1, 2026
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
5 changes: 5 additions & 0 deletions packages/react-router/src/ssr/renderRouterToStream.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ export const renderRouterToStream = async ({

if (isbot(request.headers.get('User-Agent'))) {
await waitForReadyOrAbort(stream.allReady, request.signal)

if (request.signal.aborted) {
stream.cancel().catch(() => {})
throw request.signal.reason ?? new Error('Request aborted')
}
}

const responseStream = transformReadableStreamWithRouter(
Expand Down
4 changes: 4 additions & 0 deletions packages/solid-router/src/ssr/renderRouterToStream.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ export const renderRouterToStream = async ({
Promise.resolve(stream as unknown),
request.signal,
)

if (request.signal.aborted) {
throw request.signal.reason ?? new Error('Request aborted')
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

const solidWritable = new WritableStream({
Expand Down