@tanstack/router-core 1.139.11 → 1.139.13

package/src/ssr/transformStreamWithRouter.ts

@@ -35,7 +35,7 @@ type ReadablePassthrough = {
   destroyed: boolean
 }
 
-function createPassthrough(onCancel?: () => void) {
+function createPassthrough(onCancel: () => void) {
   let controller: ReadableStreamDefaultController<any>
   const encoder = new TextEncoder()
   const stream = new ReadableStream({
@@ -44,13 +44,15 @@ function createPassthrough(onCancel?: () => void) {
     },
     cancel() {
       res.destroyed = true
-      onCancel?.()
+      onCancel()
     },
   })
 
   const res: ReadablePassthrough = {
     stream,
     write: (chunk) => {
+      // Don't write to destroyed stream
+      if (res.destroyed) return
       if (typeof chunk === 'string') {
         controller.enqueue(encoder.encode(chunk))
       } else {
@@ -58,13 +60,17 @@ function createPassthrough(onCancel?: () => void) {
       }
     },
     end: (chunk) => {
+      // Don't end already destroyed stream
+      if (res.destroyed) return
       if (chunk) {
         res.write(chunk)
       }
-      controller.close()
       res.destroyed = true
+      controller.close()
     },
     destroy: (error) => {
+      // Don't destroy already destroyed stream
+      if (res.destroyed) return
       res.destroyed = true
       controller.error(error)
     },
@@ -105,14 +111,20 @@ export function transformStreamWithRouter(
 ) {
   let stopListeningToInjectedHtml: (() => void) | undefined = undefined
   let timeoutHandle: NodeJS.Timeout
+  let cleanedUp = false
 
-  const finalPassThrough = createPassthrough(() => {
+  function cleanup() {
+    if (cleanedUp) return
+    cleanedUp = true
     if (stopListeningToInjectedHtml) {
       stopListeningToInjectedHtml()
       stopListeningToInjectedHtml = undefined
     }
     clearTimeout(timeoutHandle)
-  })
+    router.serverSsr?.cleanup()
+  }
+
+  const finalPassThrough = createPassthrough(cleanup)
   const textDecoder = new TextDecoder()
 
   let isAppRendering = true
@@ -149,13 +161,16 @@ export function transformStreamWithRouter(
   )
 
   function handleInjectedHtml() {
+    // Don't process if already cleaned up
+    if (cleanedUp) return
+
     router.serverSsr!.injectedHtml.forEach((promise) => {
       processingCount++
 
       promise
         .then((html) => {
-          // Don't write to destroyed stream
-          if (finalPassThrough.destroyed) {
+          // Don't write to destroyed stream or after cleanup
+          if (cleanedUp || finalPassThrough.destroyed) {
             return
           }
           if (isAppRendering) {
@@ -165,10 +180,7 @@ export function transformStreamWithRouter(
           }
         })
         .catch((err) => {
-          // Only reject if not already settled
-          if (!finalPassThrough.destroyed) {
-            injectedHtmlDonePromise.reject(err)
-          }
+          injectedHtmlDonePromise.reject(err)
         })
         .finally(() => {
           processingCount--
@@ -183,6 +195,11 @@ export function transformStreamWithRouter(
 
   injectedHtmlDonePromise
     .then(() => {
+      // Don't process if already cleaned up or destroyed
+      if (cleanedUp || finalPassThrough.destroyed) {
+        return
+      }
+
       clearTimeout(timeoutHandle)
       const finalHtml =
         leftover + leftoverHtml + getBufferedRouterStream() + pendingClosingTags
@@ -194,19 +211,24 @@ export function transformStreamWithRouter(
       finalPassThrough.end(finalHtml)
     })
     .catch((err) => {
+      // Don't process if already cleaned up
+      if (cleanedUp || finalPassThrough.destroyed) {
+        return
+      }
+
       console.error('Error reading routerStream:', err)
       finalPassThrough.destroy(err)
     })
-    .finally(() => {
-      if (stopListeningToInjectedHtml) {
-        stopListeningToInjectedHtml()
-        stopListeningToInjectedHtml = undefined
-      }
-    })
+    .finally(cleanup)
 
   // Transform the appStream
   readStream(appStream, {
     onData: (chunk) => {
+      // Don't process if already cleaned up
+      if (cleanedUp || finalPassThrough.destroyed) {
+        return
+      }
+
       const text = decodeChunk(chunk.value)
       const chunkString = leftover + text
       const bodyEndMatch = chunkString.match(patternBodyEnd)
@@ -266,8 +288,8 @@ export function transformStreamWithRouter(
       }
     },
     onEnd: () => {
-      // Don't process if stream was already destroyed/cancelled
-      if (finalPassThrough.destroyed) {
+      // Don't process if stream was already destroyed/cancelled or cleaned up
+      if (cleanedUp || finalPassThrough.destroyed) {
         return
       }
 
@@ -288,6 +310,11 @@ export function transformStreamWithRouter(
       }
     },
     onError: (error) => {
+      // Don't process if already cleaned up
+      if (cleanedUp) {
+        return
+      }
+
       console.error('Error reading appStream:', error)
       isAppRendering = false
       router.serverSsr!.setRenderFinished()