Skip to content

fix: memory leaks #5896

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

Merged
schiller-manuel merged 7 commits into from
Nov 19, 2025
Merged

fix: memory leaks #5896

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7735af
fix: memory leaks
schiller-manuel Nov 18, 2025
a6494bd
more fixes
schiller-manuel Nov 18, 2025
7b2bbfa
more fixes
schiller-manuel Nov 18, 2025
5504347
clear timeout
schiller-manuel Nov 18, 2025
7cfa14e
fix tests to not rely on fetch patch serverside
schiller-manuel Nov 18, 2025
00d21da
disable prerendering of /users
schiller-manuel Nov 19, 2025
08391dd
remove tests for users prerendering
schiller-manuel Nov 19, 2025
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: 14 additions & 9 deletions packages/router-core/src/ssr/transformStreamWithRouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,17 @@ type ReadablePassthrough = {
destroyed: boolean
}

function createPassthrough() {
function createPassthrough(onCancel?: () => void) {
let controller: ReadableStreamDefaultController<any>
const encoder = new TextEncoder()
const stream = new ReadableStream({
start(c) {
controller = c
},
cancel() {
res.destroyed = true
onCancel?.()
},
})

const res: ReadablePassthrough = {
Expand Down Expand Up @@ -96,7 +100,11 @@ export function transformStreamWithRouter(
timeoutMs?: number
},
) {
const finalPassThrough = createPassthrough()
let stopListeningToInjectedHtml: (() => void) | undefined = undefined

const finalPassThrough = createPassthrough(() => {
stopListeningToInjectedHtml?.()
})
Comment thread
coderabbitai[bot] marked this conversation as resolved.
const textDecoder = new TextDecoder()

let isAppRendering = true as boolean
Expand Down Expand Up @@ -130,12 +138,9 @@ export function transformStreamWithRouter(
})

// Listen for any new injected HTML
const stopListeningToInjectedHtml = router.subscribe(
'onInjectedHtml',
(e) => {
handleInjectedHtml(e.promise)
},
)
stopListeningToInjectedHtml = router.subscribe('onInjectedHtml', (e) => {
handleInjectedHtml(e.promise)
})

function handleInjectedHtml(promise: Promise<string>) {
processingCount++
Expand Down Expand Up @@ -170,7 +175,7 @@ export function transformStreamWithRouter(
console.error('Error reading routerStream:', err)
finalPassThrough.destroy(err)
})
.finally(stopListeningToInjectedHtml)
.finally(() => stopListeningToInjectedHtml?.())

// Transform the appStream
readStream(appStream, {
Expand Down
Loading
Loading