Skip to content

Commit b345071

Browse files
mcollinamcollina
authored
Update to Node v18.16.0 (#515)
* Update to Node v18.16.0 Signed-off-by: Matteo Collina <[email protected]> * fixup Signed-off-by: Matteo Collina <[email protected]> * fixup Signed-off-by: Matteo Collina <[email protected]> * fixupo Signed-off-by: Matteo Collina <[email protected]> * fixup Signed-off-by: Matteo Collina <[email protected]> * format Signed-off-by: Matteo Collina <[email protected]> --------- Signed-off-by: Matteo Collina <[email protected]>
1 parent 29fae5b commit b345071

30 files changed

+852
-140
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
npm install readable-stream
1212
```
1313

14-
This package is a mirror of the streams implementations in Node.js 18.9.0.
14+
This package is a mirror of the streams implementations in Node.js 18.16.0.
1515

16-
Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v18.9.0/docs/api/stream.html).
16+
Full documentation may be found on the [Node.js website](https://nodejs.org/dist/v18.16.0/docs/api/stream.html).
1717

1818
If you want to guarantee a stable streams base, regardless of what version of
1919
Node you, or the users of your libraries are using, use **readable-stream** _only_ and avoid the _"stream"_ module in Node-core, for background see [this blogpost](http://r.va.gg/2014/06/why-i-dont-use-nodes-core-stream-module.html).

‎build/files.mjs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ export const skippedSources = [
2525
'test/parallel/test-stream-readable-async-iterators.js',
2626
'test/parallel/test-stream-wrap-drain.js',
2727
'test/parallel/test-stream-wrap-encoding.js',
28-
'test/parallel/test-stream-wrap.js'
28+
'test/parallel/test-stream-wrap.js',
29+
'test/parallel/test-stream-toWeb-allows-server-response.js',
30+
'test/parallel/test-readable-from-web-enqueue-then-close.js'
2931
]
3032

3133
export const aliases = {}

‎build/replacements.mjs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ const internalStreamsAbortControllerPolyfill = [
1717
`
1818
]
1919

20+
const internalStreamsAbortControllerPolyfill2 = [
21+
"'use strict'",
22+
`
23+
'use strict'
24+
25+
const AbortController = globalThis.AbortController || require(\'abort-controller\').AbortController;
26+
27+
`
28+
]
29+
2030
const internalStreamsNoRequireBlob = [
2131
"const \\{\\n isBlob,\\n\\} = require\\('internal/blob'\\);",
2232
`
@@ -51,6 +61,8 @@ const internalStreamsRequireStream = ["require\\('stream'\\)", "require('../../s
5161

5262
const internalStreamsRequireStreams = ["require\\('internal/streams/([^']+)'\\)", "require('./$1')"]
5363

64+
const streamSlashPromisesToStreamDotPromises= ["require\\('(node:)?stream/promises'\\)", "require('../../lib/stream').promises"]
65+
5466
const internalStreamsRequireUtil = [
5567
"require\\('internal/util(?:/(?:debuglog|inspect))?'\\)",
5668
"require('../../ours/util')"
@@ -301,6 +313,13 @@ export const replacements = {
301313
testParallelTicksReenableConsoleLog,
302314
testParallelTickSaveHook
303315
],
316+
'test/parallel/test-stream3-pipeline-async-iterator.js': [
317+
internalStreamsAbortControllerPolyfill2,
318+
streamSlashPromisesToStreamDotPromises
319+
],
320+
'test/parallel/test-stream-compose-operator.js': [
321+
internalStreamsAbortControllerPolyfill2
322+
],
304323
'test/parallel/test-stream2-readable-from-list.js': [testParallelReadableBufferListInspect],
305324
'README.md': [readmeInfo, readmeLink]
306325
}

‎lib/internal/streams/add-abort-signal.js‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict'
22

33
const { AbortError, codes } = require('../../ours/errors')
4+
const { isNodeStream, isWebStream, kControllerErrorFunction } = require('./utils')
45
const eos = require('./end-of-stream')
56
const { ERR_INVALID_ARG_TYPE } = codes
67

@@ -12,27 +13,32 @@ const validateAbortSignal = (signal, name) => {
1213
throw new ERR_INVALID_ARG_TYPE(name, 'AbortSignal', signal)
1314
}
1415
}
15-
function isNodeStream(obj) {
16-
return !!(obj && typeof obj.pipe === 'function')
17-
}
1816
module.exports.addAbortSignal = function addAbortSignal(signal, stream) {
1917
validateAbortSignal(signal, 'signal')
20-
if (!isNodeStream(stream)) {
21-
throw new ERR_INVALID_ARG_TYPE('stream', 'stream.Stream', stream)
18+
if (!isNodeStream(stream) && !isWebStream(stream)) {
19+
throw new ERR_INVALID_ARG_TYPE('stream', ['ReadableStream', 'WritableStream', 'Stream'], stream)
2220
}
2321
return module.exports.addAbortSignalNoValidate(signal, stream)
2422
}
2523
module.exports.addAbortSignalNoValidate = function (signal, stream) {
2624
if (typeof signal !== 'object' || !('aborted' in signal)) {
2725
return stream
2826
}
29-
const onAbort = () => {
30-
stream.destroy(
31-
new AbortError(undefined, {
32-
cause: signal.reason
33-
})
34-
)
35-
}
27+
const onAbort = isNodeStream(stream)
28+
? () => {
29+
stream.destroy(
30+
new AbortError(undefined, {
31+
cause: signal.reason
32+
})
33+
)
34+
}
35+
: () => {
36+
stream[kControllerErrorFunction](
37+
new AbortError(undefined, {
38+
cause: signal.reason
39+
})
40+
)
41+
}
3642
if (signal.aborted) {
3743
onAbort()
3844
} else {

‎lib/internal/streams/compose.js‎

Lines changed: 101 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,20 @@
33
const { pipeline } = require('./pipeline')
44
const Duplex = require('./duplex')
55
const { destroyer } = require('./destroy')
6-
const { isNodeStream, isReadable, isWritable } = require('./utils')
6+
const {
7+
isNodeStream,
8+
isReadable,
9+
isWritable,
10+
isWebStream,
11+
isTransformStream,
12+
isWritableStream,
13+
isReadableStream
14+
} = require('./utils')
715
const {
816
AbortError,
917
codes: { ERR_INVALID_ARG_VALUE, ERR_MISSING_ARGS }
1018
} = require('../../ours/errors')
19+
const eos = require('./end-of-stream')
1120
module.exports = function compose(...streams) {
1221
if (streams.length === 0) {
1322
throw new ERR_MISSING_ARGS('streams')
@@ -24,14 +33,17 @@ module.exports = function compose(...streams) {
2433
streams[idx] = Duplex.from(streams[idx])
2534
}
2635
for (let n = 0; n < streams.length; ++n) {
27-
if (!isNodeStream(streams[n])) {
36+
if (!isNodeStream(streams[n]) && !isWebStream(streams[n])) {
2837
// TODO(ronag): Add checks for non streams.
2938
continue
3039
}
31-
if (n < streams.length - 1 && !isReadable(streams[n])) {
40+
if (
41+
n < streams.length - 1 &&
42+
!(isReadable(streams[n]) || isReadableStream(streams[n]) || isTransformStream(streams[n]))
43+
) {
3244
throw new ERR_INVALID_ARG_VALUE(`streams[${n}]`, orgStreams[n], 'must be readable')
3345
}
34-
if (n > 0 && !isWritable(streams[n])) {
46+
if (n > 0 && !(isWritable(streams[n]) || isWritableStream(streams[n]) || isTransformStream(streams[n]))) {
3547
throw new ERR_INVALID_ARG_VALUE(`streams[${n}]`, orgStreams[n], 'must be writable')
3648
}
3749
}
@@ -53,8 +65,8 @@ module.exports = function compose(...streams) {
5365
}
5466
const head = streams[0]
5567
const tail = pipeline(streams, onfinished)
56-
const writable = !!isWritable(head)
57-
const readable = !!isReadable(tail)
68+
const writable = !!(isWritable(head) || isWritableStream(head) || isTransformStream(head))
69+
const readable = !!(isReadable(tail) || isReadableStream(tail) || isTransformStream(tail))
5870

5971
// TODO(ronag): Avoid double buffering.
6072
// Implement Writable/Readable/Duplex traits.
@@ -67,25 +79,49 @@ module.exports = function compose(...streams) {
6779
readable
6880
})
6981
if (writable) {
70-
d._write = function (chunk, encoding, callback) {
71-
if (head.write(chunk, encoding)) {
72-
callback()
73-
} else {
74-
ondrain = callback
82+
if (isNodeStream(head)) {
83+
d._write = function (chunk, encoding, callback) {
84+
if (head.write(chunk, encoding)) {
85+
callback()
86+
} else {
87+
ondrain = callback
88+
}
7589
}
76-
}
77-
d._final = function (callback) {
78-
head.end()
79-
onfinish = callback
80-
}
81-
head.on('drain', function () {
82-
if (ondrain) {
83-
const cb = ondrain
84-
ondrain = null
85-
cb()
90+
d._final = function (callback) {
91+
head.end()
92+
onfinish = callback
8693
}
87-
})
88-
tail.on('finish', function () {
94+
head.on('drain', function () {
95+
if (ondrain) {
96+
const cb = ondrain
97+
ondrain = null
98+
cb()
99+
}
100+
})
101+
} else if (isWebStream(head)) {
102+
const writable = isTransformStream(head) ? head.writable : head
103+
const writer = writable.getWriter()
104+
d._write = async function (chunk, encoding, callback) {
105+
try {
106+
await writer.ready
107+
writer.write(chunk).catch(() => {})
108+
callback()
109+
} catch (err) {
110+
callback(err)
111+
}
112+
}
113+
d._final = async function (callback) {
114+
try {
115+
await writer.ready
116+
writer.close().catch(() => {})
117+
onfinish = callback
118+
} catch (err) {
119+
callback(err)
120+
}
121+
}
122+
}
123+
const toRead = isTransformStream(tail) ? tail.readable : tail
124+
eos(toRead, () => {
89125
if (onfinish) {
90126
const cb = onfinish
91127
onfinish = null
@@ -94,25 +130,46 @@ module.exports = function compose(...streams) {
94130
})
95131
}
96132
if (readable) {
97-
tail.on('readable', function () {
98-
if (onreadable) {
99-
const cb = onreadable
100-
onreadable = null
101-
cb()
102-
}
103-
})
104-
tail.on('end', function () {
105-
d.push(null)
106-
})
107-
d._read = function () {
108-
while (true) {
109-
const buf = tail.read()
110-
if (buf === null) {
111-
onreadable = d._read
112-
return
133+
if (isNodeStream(tail)) {
134+
tail.on('readable', function () {
135+
if (onreadable) {
136+
const cb = onreadable
137+
onreadable = null
138+
cb()
139+
}
140+
})
141+
tail.on('end', function () {
142+
d.push(null)
143+
})
144+
d._read = function () {
145+
while (true) {
146+
const buf = tail.read()
147+
if (buf === null) {
148+
onreadable = d._read
149+
return
150+
}
151+
if (!d.push(buf)) {
152+
return
153+
}
113154
}
114-
if (!d.push(buf)) {
115-
return
155+
}
156+
} else if (isWebStream(tail)) {
157+
const readable = isTransformStream(tail) ? tail.readable : tail
158+
const reader = readable.getReader()
159+
d._read = async function () {
160+
while (true) {
161+
try {
162+
const { value, done } = await reader.read()
163+
if (!d.push(value)) {
164+
return
165+
}
166+
if (done) {
167+
d.push(null)
168+
return
169+
}
170+
} catch {
171+
return
172+
}
116173
}
117174
}
118175
}
@@ -128,7 +185,9 @@ module.exports = function compose(...streams) {
128185
callback(err)
129186
} else {
130187
onclose = callback
131-
destroyer(tail, err)
188+
if (isNodeStream(tail)) {
189+
destroyer(tail, err)
190+
}
132191
}
133192
}
134193
return d

‎lib/internal/streams/destroy.js‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ function destroy(err, cb) {
3636
const w = this._writableState
3737
// With duplex streams we use the writable side for state.
3838
const s = w || r
39-
if ((w && w.destroyed) || (r && r.destroyed)) {
39+
if ((w !== null && w !== undefined && w.destroyed) || (r !== null && r !== undefined && r.destroyed)) {
4040
if (typeof cb === 'function') {
4141
cb()
4242
}
@@ -107,14 +107,14 @@ function emitCloseNT(self) {
107107
if (r) {
108108
r.closeEmitted = true
109109
}
110-
if ((w && w.emitClose) || (r && r.emitClose)) {
110+
if ((w !== null && w !== undefined && w.emitClose) || (r !== null && r !== undefined && r.emitClose)) {
111111
self.emit('close')
112112
}
113113
}
114114
function emitErrorNT(self, err) {
115115
const r = self._readableState
116116
const w = self._writableState
117-
if ((w && w.errorEmitted) || (r && r.errorEmitted)) {
117+
if ((w !== null && w !== undefined && w.errorEmitted) || (r !== null && r !== undefined && r.errorEmitted)) {
118118
return
119119
}
120120
if (w) {
@@ -162,10 +162,11 @@ function errorOrDestroy(stream, err, sync) {
162162

163163
const r = stream._readableState
164164
const w = stream._writableState
165-
if ((w && w.destroyed) || (r && r.destroyed)) {
165+
if ((w !== null && w !== undefined && w.destroyed) || (r !== null && r !== undefined && r.destroyed)) {
166166
return this
167167
}
168-
if ((r && r.autoDestroy) || (w && w.autoDestroy)) stream.destroy(err)
168+
if ((r !== null && r !== undefined && r.autoDestroy) || (w !== null && w !== undefined && w.autoDestroy))
169+
stream.destroy(err)
169170
else if (err) {
170171
// Avoid V8 leak, https://github.com/nodejs/node/pull/34103#issuecomment-652002364
171172
err.stack // eslint-disable-line no-unused-expressions
@@ -228,16 +229,18 @@ function constructNT(stream) {
228229
}
229230
}
230231
try {
231-
stream._construct(onConstruct)
232+
stream._construct((err) => {
233+
process.nextTick(onConstruct, err)
234+
})
232235
} catch (err) {
233-
onConstruct(err)
236+
process.nextTick(onConstruct, err)
234237
}
235238
}
236239
function emitConstructNT(stream) {
237240
stream.emit(kConstruct)
238241
}
239242
function isRequest(stream) {
240-
return stream && stream.setHeader && typeof stream.abort === 'function'
243+
return (stream === null || stream === undefined ? undefined : stream.setHeader) && typeof stream.abort === 'function'
241244
}
242245
function emitCloseLegacy(stream) {
243246
stream.emit('close')

‎lib/internal/streams/duplexify.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,6 @@ function _duplexify(pair) {
282282
cb(err)
283283
} else if (err) {
284284
d.destroy(err)
285-
} else if (!readable && !writable) {
286-
d.destroy()
287285
}
288286
}
289287

0 commit comments

Comments
 (0)