Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
9f7c7746
Unverified
Commit
9f7c7746
authored
Nov 18, 2021
by
Gerald Monaco
Committed by
GitHub
Nov 18, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor simplifications to `renderToWebStream` (#31553)
Simplifies `renderToWebStream` a little bit for #31223
parent
5a3d558c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
56 additions
and
94 deletions
+56
-94
render.tsx
packages/next/server/render.tsx
+56
-94
No files found.
packages/next/server/render.tsx
View file @
9f7c7746
...
@@ -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
(
<
OriginalComponent
{
...
props
}
/>,
res_
.
write
,
serverComponentManifest
next
)
)
const
reader
=
stream
.
getReader
()
startWriting
(
return
new
RenderResult
((
innerRes
,
next
)
=>
{
renderToReadableStream
(
bufferedReadFromReadableStream
(
reader
,
(
val
)
=>
innerRes
.
write
(
val
)).
then
(
<
OriginalComponent
{
...
props
}
/>,
()
=>
next
(),
serverComponentManifest
(
innerErr
)
=>
next
(
innerErr
)
).
getReader
()
)
)
})
})
}
}
...
@@ -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
=
''
pendingFlush
=
null
flushTimeout
=
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,60 +1578,30 @@ function renderToWebStream(
...
@@ -1586,60 +1578,30 @@ 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
onError
(
err
:
Error
)
{
if
(
!
resolved
)
{
const
doResolve
=
()
=>
{
resolved
=
true
resolve
((
res
,
next
)
=>
{
reject
(
err
)
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
)
=>
{
onCompleteShell
()
{
if
(
!
underlyingStream
)
{
if
(
!
resolved
)
{
throw
new
Error
(
resolved
=
true
'invariant: `next` called without an underlying stream. This is a bug in Next.js'
resolve
((
res
,
next
)
=>
{
)
bufferedReadFromReadableStream
(
reader
,
(
val
)
=>
res
.
write
(
val
)
).
then
(
()
=>
next
(),
(
err
)
=>
next
(
err
)
)
})
}
}
underlyingStream
.
next
(
err
)
},
}
})
)
const
reader
=
stream
.
getReader
()
const
reader
=
(
ReactDOMServer
as
any
)
.
renderToReadableStream
(
element
,
{
onError
(
err
:
Error
)
{
if
(
!
resolved
)
{
resolved
=
true
reject
(
err
)
}
},
onCompleteShell
()
{
if
(
!
resolved
)
{
resolved
=
true
doResolve
()
// Queue startWriting in microtasks to make sure reader is
// initialized.
Promise
.
resolve
().
then
(()
=>
{
startWriting
(
reader
)
})
}
},
})
.
getReader
()
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment