@tanstack/router-core 1.143.6 → 1.145.6

package/src/index.ts

@@ -432,6 +432,18 @@ export {
 
 export { defaultSerovalPlugins } from './ssr/serializer/seroval-plugins'
 
+export {
+  RawStream,
+  RawStreamSSRPlugin,
+  createRawStreamRPCPlugin,
+  createRawStreamDeserializePlugin,
+} from './ssr/serializer/RawStream'
+export type {
+  OnRawStreamCallback,
+  RawStreamHint,
+  RawStreamOptions,
+} from './ssr/serializer/RawStream'
+
 export {
   composeRewrites,
   executeRewriteInput,

package/src/scroll-restoration.ts

@@ -66,10 +66,16 @@ function createScrollRestorationCache(): ScrollRestorationCache | null {
     // This setter is simply to make sure that we set the sessionStorage right
     // after the state is updated. It doesn't necessarily need to be a functional
     // update.
-    set: (updater) => (
-      (state = functionalUpdate(updater, state) || state),
-      safeSessionStorage.setItem(storageKey, JSON.stringify(state))
-    ),
+    set: (updater) => {
+      state = functionalUpdate(updater, state) || state
+      try {
+        safeSessionStorage.setItem(storageKey, JSON.stringify(state))
+      } catch {
+        console.warn(
+          '[ts-router] Could not persist scroll restoration state to sessionStorage.',
+        )
+      }
+    },
   }
 }
 

package/src/ssr/serializer/RawStream.ts

@@ -0,0 +1,464 @@
+import { createPlugin, createStream } from 'seroval'
+import type { Plugin } from 'seroval'
+
+/**
+ * Hint for RawStream encoding strategy during SSR serialization.
+ * - 'binary': Always use base64 encoding (best for binary data like files, images)
+ * - 'text': Try UTF-8 first, fallback to base64 (best for text-heavy data like RSC payloads)
+ */
+export type RawStreamHint = 'binary' | 'text'
+
+/**
+ * Options for RawStream configuration.
+ */
+export interface RawStreamOptions {
+  /**
+   * Encoding hint for SSR serialization.
+   * - 'binary' (default): Always use base64 encoding
+   * - 'text': Try UTF-8 first, fallback to base64 for invalid UTF-8 chunks
+   */
+  hint?: RawStreamHint
+}
+
+/**
+ * Marker class for ReadableStream<Uint8Array> that should be serialized
+ * with base64 encoding (SSR) or binary framing (server functions).
+ *
+ * Wrap your binary streams with this to get efficient serialization:
+ * ```ts
+ * // For binary data (files, images, etc.)
+ * return { data: new RawStream(file.stream()) }
+ *
+ * // For text-heavy data (RSC payloads, etc.)
+ * return { data: new RawStream(rscStream, { hint: 'text' }) }
+ * ```
+ */
+export class RawStream {
+  public readonly hint: RawStreamHint
+
+  constructor(
+    public readonly stream: ReadableStream<Uint8Array>,
+    options?: RawStreamOptions,
+  ) {
+    this.hint = options?.hint ?? 'binary'
+  }
+}
+
+/**
+ * Callback type for RPC plugin to register raw streams with multiplexer
+ */
+export type OnRawStreamCallback = (
+  streamId: number,
+  stream: ReadableStream<Uint8Array>,
+) => void
+
+// Base64 helpers used in both Node and browser.
+// In Node-like runtimes, prefer Buffer for speed and compatibility.
+const BufferCtor: any = (globalThis as any).Buffer
+const hasNodeBuffer = !!BufferCtor && typeof BufferCtor.from === 'function'
+
+function uint8ArrayToBase64(bytes: Uint8Array): string {
+  if (bytes.length === 0) return ''
+
+  if (hasNodeBuffer) {
+    return BufferCtor.from(bytes).toString('base64')
+  }
+
+  // Browser fallback: chunked String.fromCharCode + btoa
+  const CHUNK_SIZE = 0x8000 // 32KB chunks to avoid stack overflow
+  const chunks: Array<string> = []
+  for (let i = 0; i < bytes.length; i += CHUNK_SIZE) {
+    const chunk = bytes.subarray(i, i + CHUNK_SIZE)
+    chunks.push(String.fromCharCode.apply(null, chunk as any))
+  }
+  return btoa(chunks.join(''))
+}
+
+function base64ToUint8Array(base64: string): Uint8Array {
+  if (base64.length === 0) return new Uint8Array(0)
+
+  if (hasNodeBuffer) {
+    const buf = BufferCtor.from(base64, 'base64')
+    return new Uint8Array(buf.buffer, buf.byteOffset, buf.byteLength)
+  }
+
+  const binary = atob(base64)
+  const bytes = new Uint8Array(binary.length)
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i)
+  }
+  return bytes
+}
+
+// Factory sentinels - use null-proto objects to avoid prototype surprises
+const RAW_STREAM_FACTORY_BINARY: Record<string, never> = Object.create(null)
+const RAW_STREAM_FACTORY_TEXT: Record<string, never> = Object.create(null)
+
+// Factory constructor for binary mode - converts seroval stream to ReadableStream<Uint8Array>
+// All chunks are base64 encoded strings
+const RAW_STREAM_FACTORY_CONSTRUCTOR_BINARY = (
+  stream: ReturnType<typeof createStream>,
+) =>
+  new ReadableStream<Uint8Array>({
+    start(controller) {
+      stream.on({
+        next(base64: string) {
+          try {
+            controller.enqueue(base64ToUint8Array(base64))
+          } catch {
+            // Stream may be closed
+          }
+        },
+        throw(error: unknown) {
+          controller.error(error)
+        },
+        return() {
+          try {
+            controller.close()
+          } catch {
+            // Stream may already be closed
+          }
+        },
+      })
+    },
+  })
+
+// Factory constructor for text mode - converts seroval stream to ReadableStream<Uint8Array>
+// Chunks are either strings (UTF-8) or { $b64: string } (base64 fallback)
+// Use module-level TextEncoder to avoid per-factory allocation
+const textEncoderForFactory = new TextEncoder()
+const RAW_STREAM_FACTORY_CONSTRUCTOR_TEXT = (
+  stream: ReturnType<typeof createStream>,
+) => {
+  return new ReadableStream<Uint8Array>({
+    start(controller) {
+      stream.on({
+        next(value: string | { $b64: string }) {
+          try {
+            if (typeof value === 'string') {
+              controller.enqueue(textEncoderForFactory.encode(value))
+            } else {
+              controller.enqueue(base64ToUint8Array(value.$b64))
+            }
+          } catch {
+            // Stream may be closed
+          }
+        },
+        throw(error: unknown) {
+          controller.error(error)
+        },
+        return() {
+          try {
+            controller.close()
+          } catch {
+            // Stream may already be closed
+          }
+        },
+      })
+    },
+  })
+}
+
+// Minified factory function for binary mode - all chunks are base64 strings
+// This must be self-contained since it's injected into the HTML
+const FACTORY_BINARY = `(s=>new ReadableStream({start(c){s.on({next(b){try{const d=atob(b),a=new Uint8Array(d.length);for(let i=0;i<d.length;i++)a[i]=d.charCodeAt(i);c.enqueue(a)}catch(_){}},throw(e){c.error(e)},return(){try{c.close()}catch(_){}}})}}))`
+
+// Minified factory function for text mode - chunks are string or {$b64: string}
+// Uses cached TextEncoder for performance
+const FACTORY_TEXT = `(s=>{const e=new TextEncoder();return new ReadableStream({start(c){s.on({next(v){try{if(typeof v==='string'){c.enqueue(e.encode(v))}else{const d=atob(v.$b64),a=new Uint8Array(d.length);for(let i=0;i<d.length;i++)a[i]=d.charCodeAt(i);c.enqueue(a)}}catch(_){}},throw(x){c.error(x)},return(){try{c.close()}catch(_){}}})}})})`
+
+// Convert ReadableStream<Uint8Array> to seroval stream with base64-encoded chunks (binary mode)
+function toBinaryStream(readable: ReadableStream<Uint8Array>) {
+  const stream = createStream()
+  const reader = readable.getReader()
+
+  // Use iterative loop instead of recursive async to avoid stack accumulation
+  ;(async () => {
+    try {
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) {
+          stream.return(undefined)
+          break
+        }
+        stream.next(uint8ArrayToBase64(value))
+      }
+    } catch (error) {
+      stream.throw(error)
+    } finally {
+      reader.releaseLock()
+    }
+  })()
+
+  return stream
+}
+
+// Convert ReadableStream<Uint8Array> to seroval stream with UTF-8 first, base64 fallback (text mode)
+function toTextStream(readable: ReadableStream<Uint8Array>) {
+  const stream = createStream()
+  const reader = readable.getReader()
+  const decoder = new TextDecoder('utf-8', { fatal: true })
+
+  // Use iterative loop instead of recursive async to avoid stack accumulation
+  ;(async () => {
+    try {
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) {
+          // Flush any remaining bytes in the decoder
+          try {
+            const remaining = decoder.decode()
+            if (remaining.length > 0) {
+              stream.next(remaining)
+            }
+          } catch {
+            // Ignore decode errors on flush
+          }
+          stream.return(undefined)
+          break
+        }
+
+        try {
+          // Try UTF-8 decode first
+          const text = decoder.decode(value, { stream: true })
+          if (text.length > 0) {
+            stream.next(text)
+          }
+        } catch {
+          // UTF-8 decode failed, fallback to base64
+          stream.next({ $b64: uint8ArrayToBase64(value) })
+        }
+      }
+    } catch (error) {
+      stream.throw(error)
+    } finally {
+      reader.releaseLock()
+    }
+  })()
+
+  return stream
+}
+
+// Factory plugin for binary mode
+const RawStreamFactoryBinaryPlugin = createPlugin<
+  Record<string, never>,
+  undefined
+>({
+  tag: 'tss/RawStreamFactory',
+  test(value) {
+    return value === RAW_STREAM_FACTORY_BINARY
+  },
+  parse: {
+    sync() {
+      return undefined
+    },
+    async() {
+      return Promise.resolve(undefined)
+    },
+    stream() {
+      return undefined
+    },
+  },
+  serialize() {
+    return FACTORY_BINARY
+  },
+  deserialize() {
+    return RAW_STREAM_FACTORY_BINARY
+  },
+})
+
+// Factory plugin for text mode
+const RawStreamFactoryTextPlugin = createPlugin<
+  Record<string, never>,
+  undefined
+>({
+  tag: 'tss/RawStreamFactoryText',
+  test(value) {
+    return value === RAW_STREAM_FACTORY_TEXT
+  },
+  parse: {
+    sync() {
+      return undefined
+    },
+    async() {
+      return Promise.resolve(undefined)
+    },
+    stream() {
+      return undefined
+    },
+  },
+  serialize() {
+    return FACTORY_TEXT
+  },
+  deserialize() {
+    return RAW_STREAM_FACTORY_TEXT
+  },
+})
+
+/**
+ * SSR Plugin - uses base64 or UTF-8+base64 encoding for chunks, delegates to seroval's stream mechanism.
+ * Used during SSR when serializing to JavaScript code for HTML injection.
+ *
+ * Supports two modes based on RawStream hint:
+ * - 'binary': Always base64 encode (default)
+ * - 'text': Try UTF-8 first, fallback to base64 for invalid UTF-8
+ */
+export const RawStreamSSRPlugin: Plugin<any, any> = createPlugin({
+  tag: 'tss/RawStream',
+  extends: [RawStreamFactoryBinaryPlugin, RawStreamFactoryTextPlugin],
+
+  test(value: unknown) {
+    return value instanceof RawStream
+  },
+
+  parse: {
+    sync(value: RawStream, ctx) {
+      // Sync parse not really supported for streams, return empty stream
+      const factory =
+        value.hint === 'text'
+          ? RAW_STREAM_FACTORY_TEXT
+          : RAW_STREAM_FACTORY_BINARY
+      return {
+        hint: value.hint,
+        factory: ctx.parse(factory),
+        stream: ctx.parse(createStream()),
+      }
+    },
+    async async(value: RawStream, ctx) {
+      const factory =
+        value.hint === 'text'
+          ? RAW_STREAM_FACTORY_TEXT
+          : RAW_STREAM_FACTORY_BINARY
+      const encodedStream =
+        value.hint === 'text'
+          ? toTextStream(value.stream)
+          : toBinaryStream(value.stream)
+      return {
+        hint: value.hint,
+        factory: await ctx.parse(factory),
+        stream: await ctx.parse(encodedStream),
+      }
+    },
+    stream(value: RawStream, ctx) {
+      const factory =
+        value.hint === 'text'
+          ? RAW_STREAM_FACTORY_TEXT
+          : RAW_STREAM_FACTORY_BINARY
+      const encodedStream =
+        value.hint === 'text'
+          ? toTextStream(value.stream)
+          : toBinaryStream(value.stream)
+      return {
+        hint: value.hint,
+        factory: ctx.parse(factory),
+        stream: ctx.parse(encodedStream),
+      }
+    },
+  },
+
+  serialize(node: { hint: RawStreamHint; factory: any; stream: any }, ctx) {
+    return (
+      '(' +
+      ctx.serialize(node.factory) +
+      ')(' +
+      ctx.serialize(node.stream) +
+      ')'
+    )
+  },
+
+  deserialize(
+    node: { hint: RawStreamHint; factory: any; stream: any },
+    ctx,
+  ): any {
+    const stream: ReturnType<typeof createStream> = ctx.deserialize(node.stream)
+    return node.hint === 'text'
+      ? RAW_STREAM_FACTORY_CONSTRUCTOR_TEXT(stream)
+      : RAW_STREAM_FACTORY_CONSTRUCTOR_BINARY(stream)
+  },
+}) as Plugin<any, any>
+
+/**
+ * Node type for RPC plugin serialization
+ */
+interface RawStreamRPCNode {
+  streamId: number
+}
+
+/**
+ * Creates an RPC plugin instance that registers raw streams with a multiplexer.
+ * Used for server function responses where we want binary framing.
+ * Note: RPC always uses binary framing regardless of hint.
+ *
+ * @param onRawStream Callback invoked when a RawStream is encountered during serialization
+ */
+export function createRawStreamRPCPlugin(
+  onRawStream: OnRawStreamCallback,
+): Plugin<any, any> {
+  // Own stream counter - sequential IDs starting at 1, independent of seroval internals
+  let nextStreamId = 1
+
+  return createPlugin({
+    tag: 'tss/RawStream',
+
+    test(value: unknown) {
+      return value instanceof RawStream
+    },
+
+    parse: {
+      async(value: RawStream) {
+        const streamId = nextStreamId++
+        onRawStream(streamId, value.stream)
+        return Promise.resolve({ streamId })
+      },
+      stream(value: RawStream) {
+        const streamId = nextStreamId++
+        onRawStream(streamId, value.stream)
+        return { streamId }
+      },
+    },
+
+    serialize(): never {
+      // RPC uses toCrossJSONStream which produces JSON nodes, not JS code.
+      // This method is only called by crossSerialize* which we don't use.
+      throw new Error(
+        'RawStreamRPCPlugin.serialize should not be called. RPC uses JSON serialization, not JS code generation.',
+      )
+    },
+
+    deserialize(): never {
+      // Client uses createRawStreamDeserializePlugin instead
+      throw new Error(
+        'RawStreamRPCPlugin.deserialize should not be called. Use createRawStreamDeserializePlugin on client.',
+      )
+    },
+  }) as Plugin<any, any>
+}
+
+/**
+ * Creates a deserialize-only plugin for client-side stream reconstruction.
+ * Used in serverFnFetcher to wire up streams from frame decoder.
+ *
+ * @param getOrCreateStream Function to get/create a stream by ID from frame decoder
+ */
+export function createRawStreamDeserializePlugin(
+  getOrCreateStream: (id: number) => ReadableStream<Uint8Array>,
+): Plugin<any, any> {
+  return createPlugin({
+    tag: 'tss/RawStream',
+
+    test: () => false, // Client never serializes RawStream
+
+    parse: {}, // Client only deserializes, never parses
+
+    serialize(): never {
+      // Client never serializes RawStream back to server
+      throw new Error(
+        'RawStreamDeserializePlugin.serialize should not be called. Client only deserializes.',
+      )
+    },
+
+    deserialize(node: RawStreamRPCNode) {
+      return getOrCreateStream(node.streamId)
+    },
+  }) as Plugin<any, any>
+}

package/src/ssr/serializer/seroval-plugins.ts

@@ -1,9 +1,12 @@
 import { ReadableStreamPlugin } from 'seroval-plugins/web'
 import { ShallowErrorPlugin } from './ShallowErrorPlugin'
+import { RawStreamSSRPlugin } from './RawStream'
 import type { Plugin } from 'seroval'
 
 export const defaultSerovalPlugins = [
   ShallowErrorPlugin as Plugin<Error, any>,
+  // RawStreamSSRPlugin must come before ReadableStreamPlugin to match first
+  RawStreamSSRPlugin,
   // ReadableStreamNode is not exported by seroval
   ReadableStreamPlugin as Plugin<ReadableStream, any>,
 ]

package/src/ssr/serializer/transformer.ts

@@ -8,6 +8,7 @@ import type {
 } from '../../router'
 import type { LooseReturnType } from '../../utils'
 import type { AnyRoute, ResolveAllSSR } from '../../route'
+import type { RawStream } from './RawStream'
 
 declare const TSR_SERIALIZABLE: unique symbol
 export type TSR_SERIALIZABLE = typeof TSR_SERIALIZABLE
@@ -21,6 +22,8 @@ export interface DefaultSerializable {
   undefined: undefined
   bigint: bigint
   Date: Date
+  Uint8Array: Uint8Array
+  RawStream: RawStream
   TsrSerializable: TsrSerializable
 }