Unverified Commit 9f7c7746 authored by Gerald Monaco's avatar Gerald Monaco Committed by GitHub

Minor simplifications to `renderToWebStream` (#31553)

Simplifies `renderToWebStream` a little bit for #31223
parent 5a3d558c
...@@ -1001,16 +1001,15 @@ export async function renderToHTML( ...@@ -1001,16 +1001,15 @@ export async function renderToHTML(
if (isResSent(res) && !isSSG) return null if (isResSent(res) && !isSSG) return null
if (renderServerComponentData) { if (renderServerComponentData) {
return new RenderResult((res_, next) => { const stream: ReadableStream = renderToReadableStream(
const { startWriting } = connectReactServerReadableStreamToPiper(
res_.write,
next
)
startWriting(
renderToReadableStream(
<OriginalComponent {...props} />, <OriginalComponent {...props} />,
serverComponentManifest serverComponentManifest
).getReader() )
const reader = stream.getReader()
return new RenderResult((innerRes, next) => {
bufferedReadFromReadableStream(reader, (val) => innerRes.write(val)).then(
() => next(),
(innerErr) => next(innerErr)
) )
}) })
} }
...@@ -1539,46 +1538,39 @@ function renderToNodeStream( ...@@ -1539,46 +1538,39 @@ function renderToNodeStream(
}) })
} }
function connectReactServerReadableStreamToPiper( async function bufferedReadFromReadableStream(
write: (s: string) => void, reader: ReadableStreamDefaultReader,
next: (err?: Error) => void writeFn: (val: string) => void
) { ): Promise<void> {
const decoder = new TextDecoder()
let bufferedString = '' let bufferedString = ''
let flushTimeout: null | NodeJS.Timeout = null let pendingFlush: Promise<void> | null = null
function flushBuffer() { const flushBuffer = () => {
// Intentionally delayed writing when using ReadableStream due to the lack if (!pendingFlush) {
// of cork/uncork APIs. pendingFlush = new Promise((resolve) =>
if (!flushTimeout) { setTimeout(() => {
flushTimeout = setTimeout(() => { writeFn(bufferedString)
write(bufferedString)
bufferedString = '' bufferedString = ''
flushTimeout = null pendingFlush = null
resolve()
}, 0) }, 0)
)
} }
} }
function startWriting(reader: ReadableStreamDefaultReader) { while (true) {
const decoder = new TextDecoder() const { done, value } = await reader.read()
const process = () => { if (done) {
reader.read().then(({ done, value }: any) => { break
if (!done) {
const s = typeof value === 'string' ? value : decoder.decode(value)
bufferedString += s
flushBuffer()
process()
} else {
// Make sure it's scheduled after the current flushing.
setTimeout(() => next(), 0)
}
})
}
process()
} }
return { bufferedString += typeof value === 'string' ? value : decoder.decode(value)
startWriting, flushBuffer()
} }
// Make sure the promise resolves after any pending flushes
await pendingFlush
} }
function renderToWebStream( function renderToWebStream(
...@@ -1586,41 +1578,9 @@ function renderToWebStream( ...@@ -1586,41 +1578,9 @@ function renderToWebStream(
): Promise<NodeWritablePiper> { ): Promise<NodeWritablePiper> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let resolved = false let resolved = false
let underlyingStream: { const stream: ReadableStream = (
write: (s: string) => void ReactDOMServer as any
next: (err?: Error) => void ).renderToReadableStream(element, {
} | null = null
const doResolve = () => {
resolve((res, next) => {
underlyingStream = {
write: res.write,
next,
}
})
}
const { startWriting } = connectReactServerReadableStreamToPiper(
(s: string) => {
if (!underlyingStream) {
throw new Error(
'invariant: `write` called without an underlying stream. This is a bug in Next.js'
)
}
underlyingStream.write(s)
},
(err) => {
if (!underlyingStream) {
throw new Error(
'invariant: `next` called without an underlying stream. This is a bug in Next.js'
)
}
underlyingStream.next(err)
}
)
const reader = (ReactDOMServer as any)
.renderToReadableStream(element, {
onError(err: Error) { onError(err: Error) {
if (!resolved) { if (!resolved) {
resolved = true resolved = true
...@@ -1630,16 +1590,18 @@ function renderToWebStream( ...@@ -1630,16 +1590,18 @@ function renderToWebStream(
onCompleteShell() { onCompleteShell() {
if (!resolved) { if (!resolved) {
resolved = true resolved = true
doResolve() resolve((res, next) => {
// Queue startWriting in microtasks to make sure reader is bufferedReadFromReadableStream(reader, (val) =>
// initialized. res.write(val)
Promise.resolve().then(() => { ).then(
startWriting(reader) () => next(),
(err) => next(err)
)
}) })
} }
}, },
}) })
.getReader() const reader = stream.getReader()
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment