Skip to content

Commit 86d78d1

Browse files
committed
refactor(server-renderer): adjust streaming API
- add `pipeToNodeWritable` - add `pipeToWebWritable`
1 parent 17cc4e1 commit 86d78d1

File tree

6 files changed

+173
-47
lines changed

6 files changed

+173
-47
lines changed

packages/global.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ declare module 'file-saver' {
3636

3737
declare module 'stream/web' {
3838
const r: typeof ReadableStream
39-
export { r as ReadableStream }
39+
const t: typeof TransformStream
40+
export { r as ReadableStream, t as TransformStream }
4041
}

packages/server-renderer/README.md

+46-13
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ Renders input as a [Node.js Readable stream](https://nodejs.org/api/stream.html#
5050
**Signature**
5151

5252
```ts
53-
function renderToNodeStream(
54-
input: App | VNode,
55-
context?: SSRContext
56-
): Readable
53+
function renderToNodeStream(input: App | VNode, context?: SSRContext): Readable
5754
```
5855

5956
**Usage**
@@ -63,12 +60,27 @@ function renderToNodeStream(
6360
renderToNodeStream(app).pipe(res)
6461
```
6562

66-
In the ESM build of `@vue/server-renderer`, which is decoupled from Node.js environments, the `Readable` constructor must be explicitly passed in as the 3rd argument:
63+
**Note:** This method is not supported in the ESM build of `@vue/server-renderer`, which is decoupled from Node.js environments. Use `pipeToNodeWritable` instead.
6764

68-
```js
69-
import { Readable } from 'stream'
65+
### `pipeToNodeWritable`
66+
67+
Render and pipe to an existing [Node.js Writable stream](https://nodejs.org/api/stream.html#stream_writable_streams) instance.
7068

71-
renderToNodeStream(app, {}, Readable).pipe(res)
69+
**Signature**
70+
71+
```ts
72+
function pipeToNodeWritable(
73+
input: App | VNode,
74+
context: SSRContext = {},
75+
writable: Writable
76+
): void
77+
```
78+
79+
**Usage**
80+
81+
```js
82+
// inside a Node.js http handler
83+
pipeToNodeWritable(app, {}, res)
7284
```
7385

7486
### `renderToWebStream`
@@ -88,19 +100,40 @@ function renderToWebStream(
88100
**Usage**
89101

90102
```js
91-
// e.g. inside an environment with ReadableStream support
103+
// inside an environment with ReadableStream support
92104
return new Response(renderToWebStream(app))
93105
```
94106

95-
Note in environments that do not expose `ReadableStream` constructor in the global scope, the constructor must be explicitly passed in as the 3rd argument. For example in Node.js 16.5.0+ where web streams are also supported:
107+
**Note:** in environments that do not expose `ReadableStream` constructor in the global scope, `pipeToWebWritable` should be used instead.
108+
109+
### `pipeToWebWritable`
110+
111+
Render and pipe to an existing [Web WritableStream](https://developer.mozilla.org/en-US/docs/Web/API/WritableStream) instance.
112+
113+
**Signature**
114+
115+
```ts
116+
function pipeToWebWritable(
117+
input: App | VNode,
118+
context: SSRContext = {},
119+
writable: WritableStream
120+
): void
121+
```
122+
123+
**Usage**
124+
125+
This is typically used in combination with [`TransformStream`](https://developer.mozilla.org/en-US/docs/Web/API/TransformStream):
96126

97127
```js
98-
import { ReadableStream } from 'stream/web'
128+
// TransformStream is available in environments such as CloudFlare workers.
129+
// in Node.js, TransformStream needs to be explicitly imported from 'stream/web'
130+
const { readable, writable } = new TransformStream()
131+
pipeToWebWritable(app, {}, writable)
99132
100-
const stream = renderToWebStream(app, {}, ReadableStream)
133+
return new Response(readable)
101134
```
102135

103-
## `renderToSimpleStream`
136+
### `renderToSimpleStream`
104137

105138
Renders input in streaming mode using a simple readable interface.
106139

packages/server-renderer/__tests__/render.spec.ts

+19-6
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ import {
2424
} from 'vue'
2525
import { escapeHtml } from '@vue/shared'
2626
import { renderToString } from '../src/renderToString'
27-
import { renderToNodeStream } from '../src/renderToStream'
27+
import { renderToNodeStream, pipeToNodeWritable } from '../src/renderToStream'
2828
import { ssrRenderSlot, SSRSlot } from '../src/helpers/ssrRenderSlot'
2929
import { ssrRenderComponent } from '../src/helpers/ssrRenderComponent'
30-
import { Readable } from 'stream'
30+
import { Readable, Transform } from 'stream'
3131
import { ssrRenderVNode } from '../src'
3232

3333
const promisifyStream = (stream: Readable) => {
@@ -45,12 +45,25 @@ const promisifyStream = (stream: Readable) => {
4545
})
4646
}
4747

48-
const renderToStream = (app: any, context?: any) =>
49-
promisifyStream(renderToNodeStream(app, context))
48+
const renderToStream = (app: any, context?: any) => {
49+
return promisifyStream(renderToNodeStream(app, context))
50+
}
51+
52+
const pipeToWritable = (app: any, context?: any) => {
53+
const stream = new Transform({
54+
transform(data, _encoding, cb) {
55+
this.push(data)
56+
cb()
57+
}
58+
})
59+
pipeToNodeWritable(app, context, stream)
60+
return promisifyStream(stream)
61+
}
5062

5163
// we run the same tests twice, once for renderToString, once for renderToStream
5264
testRender(`renderToString`, renderToString)
53-
testRender(`renderToStream`, renderToStream)
65+
testRender(`renderToNodeStream`, renderToStream)
66+
testRender(`pipeToNodeWritable`, pipeToWritable)
5467

5568
function testRender(type: string, render: typeof renderToString) {
5669
describe(`ssr: ${type}`, () => {
@@ -760,7 +773,7 @@ function testRender(type: string, render: typeof renderToString) {
760773
test('handle compiler errors', async () => {
761774
await render(
762775
// render different content since compilation is cached
763-
createApp({ template: `<${type === 'renderToString' ? 'div' : 'p'}` })
776+
createApp({ template: `<div>${type}</` })
764777
)
765778

766779
expect(

packages/server-renderer/__tests__/webStream.spec.ts

+42-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@
33
*/
44

55
import { createApp, h, defineAsyncComponent } from 'vue'
6-
import { ReadableStream } from 'stream/web'
7-
import { renderToWebStream } from '../src'
6+
import { ReadableStream, TransformStream } from 'stream/web'
7+
import { pipeToWebWritable, renderToWebStream } from '../src'
88

9-
test('should work', async () => {
9+
beforeEach(() => {
10+
global.ReadableStream = ReadableStream
11+
})
12+
13+
afterEach(() => {
14+
// @ts-ignore
15+
delete global.ReadableStream
16+
})
17+
18+
test('renderToWebStream', async () => {
1019
const Async = defineAsyncComponent(() =>
1120
Promise.resolve({
1221
render: () => h('div', 'async')
@@ -16,14 +25,42 @@ test('should work', async () => {
1625
render: () => [h('div', 'parent'), h(Async)]
1726
}
1827

19-
const stream = renderToWebStream(createApp(App), {}, ReadableStream)
28+
const stream = renderToWebStream(createApp(App))
2029

2130
const reader = stream.getReader()
31+
const decoder = new TextDecoder()
32+
33+
let res = ''
34+
await reader.read().then(function read({ done, value }): any {
35+
if (!done) {
36+
res += decoder.decode(value)
37+
return reader.read().then(read)
38+
}
39+
})
40+
41+
expect(res).toBe(`<!--[--><div>parent</div><div>async</div><!--]-->`)
42+
})
43+
44+
test('pipeToWebWritable', async () => {
45+
const Async = defineAsyncComponent(() =>
46+
Promise.resolve({
47+
render: () => h('div', 'async')
48+
})
49+
)
50+
const App = {
51+
render: () => [h('div', 'parent'), h(Async)]
52+
}
53+
54+
const { readable, writable } = new TransformStream()
55+
pipeToWebWritable(createApp(App), {}, writable)
56+
57+
const reader = readable.getReader()
58+
const decoder = new TextDecoder()
2259

2360
let res = ''
2461
await reader.read().then(function read({ done, value }): any {
2562
if (!done) {
26-
res += value
63+
res += decoder.decode(value)
2764
return reader.read().then(read)
2865
}
2966
})

packages/server-renderer/src/index.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@
22
export { SSRContext } from './render'
33
export { renderToString } from './renderToString'
44
export {
5-
renderToStream,
65
renderToSimpleStream,
76
renderToNodeStream,
7+
pipeToNodeWritable,
88
renderToWebStream,
9-
SimpleReadable
9+
pipeToWebWritable,
10+
SimpleReadable,
11+
// deprecated
12+
renderToStream
1013
} from './renderToStream'
1114

1215
// internal runtime helpers

packages/server-renderer/src/renderToStream.ts

+59-20
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from 'vue'
99
import { isString, isPromise } from '@vue/shared'
1010
import { renderComponentVNode, SSRBuffer, SSRContext } from './render'
11-
import { Readable } from 'stream'
11+
import { Readable, Writable } from 'stream'
1212

1313
const { isVNode } = ssrUtils
1414

@@ -99,51 +99,64 @@ export function renderToStream(
9999

100100
export function renderToNodeStream(
101101
input: App | VNode,
102-
context: SSRContext = {},
103-
UserReadable?: typeof Readable
102+
context: SSRContext = {}
104103
): Readable {
105-
const stream: Readable = UserReadable
106-
? new UserReadable()
107-
: __NODE_JS__
104+
const stream: Readable = __NODE_JS__
108105
? new (require('stream').Readable)()
109106
: null
110107

111108
if (!stream) {
112109
throw new Error(
113-
`ESM build of renderToStream() requires explicitly passing in the Node.js ` +
114-
`Readable constructor the 3rd argument. Example:\n\n` +
115-
` import { Readable } from 'stream'\n` +
116-
` const stream = renderToStream(app, {}, Readable)`
110+
`ESM build of renderToStream() does not support renderToNodeStream(). ` +
111+
`Use pipeToNodeWritable() with an existing Node.js Writable stream ` +
112+
`instance instead.`
117113
)
118114
}
119115

120116
return renderToSimpleStream(input, context, stream)
121117
}
122118

123-
const hasGlobalWebStream = typeof ReadableStream === 'function'
119+
export function pipeToNodeWritable(
120+
input: App | VNode,
121+
context: SSRContext = {},
122+
writable: Writable
123+
) {
124+
renderToSimpleStream(input, context, {
125+
push(content) {
126+
if (content != null) {
127+
writable.write(content)
128+
} else {
129+
writable.end()
130+
}
131+
},
132+
destroy(err) {
133+
writable.destroy(err)
134+
}
135+
})
136+
}
124137

125138
export function renderToWebStream(
126139
input: App | VNode,
127-
context: SSRContext = {},
128-
Ctor?: { new (): ReadableStream }
140+
context: SSRContext = {}
129141
): ReadableStream {
130-
if (!Ctor && !hasGlobalWebStream) {
142+
if (typeof ReadableStream !== 'function') {
131143
throw new Error(
132-
`ReadableStream constructor is not available in the global scope and ` +
133-
`must be explicitly passed in as the 3rd argument:\n\n` +
134-
` import { ReadableStream } from 'stream/web'\n` +
135-
` const stream = renderToWebStream(app, {}, ReadableStream)`
144+
`ReadableStream constructor is not available in the global scope. ` +
145+
`If the target environment does support web streams, consider using ` +
146+
`pipeToWebWritable() with an existing WritableStream instance instead.`
136147
)
137148
}
138149

150+
const encoder = new TextEncoder()
139151
let cancelled = false
140-
return new (Ctor || ReadableStream)({
152+
153+
return new ReadableStream({
141154
start(controller) {
142155
renderToSimpleStream(input, context, {
143156
push(content) {
144157
if (cancelled) return
145158
if (content != null) {
146-
controller.enqueue(content)
159+
controller.enqueue(encoder.encode(content))
147160
} else {
148161
controller.close()
149162
}
@@ -158,3 +171,29 @@ export function renderToWebStream(
158171
}
159172
})
160173
}
174+
175+
export function pipeToWebWritable(
176+
input: App | VNode,
177+
context: SSRContext = {},
178+
writable: WritableStream
179+
): void {
180+
const writer = writable.getWriter()
181+
const encoder = new TextEncoder()
182+
183+
writer.ready.then(() => {
184+
renderToSimpleStream(input, context, {
185+
push(content) {
186+
if (content != null) {
187+
writer.write(encoder.encode(content))
188+
} else {
189+
writer.close()
190+
}
191+
},
192+
destroy(err) {
193+
// TODO better error handling?
194+
console.log(err)
195+
writer.close()
196+
}
197+
})
198+
})
199+
}

0 commit comments

Comments
 (0)