Skip to content

Commit 7ce1cc9

Browse files
ronagMylesBorins
authored andcommitted
stream: simplify pipeline
Backport-PR-URL: #32174 PR-URL: #31316 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
1 parent 9d1b1a3 commit 7ce1cc9

File tree

1 file changed

+3
-23
lines changed

1 file changed

+3
-23
lines changed

lib/internal/streams/pipeline.js

+3-23
Original file line numberDiff line numberDiff line change
@@ -97,39 +97,19 @@ function makeAsyncIterable(val) {
9797
return val;
9898
} else if (isReadable(val)) {
9999
// Legacy streams are not Iterable.
100-
return _fromReadable(val);
100+
return fromReadable(val);
101101
} else {
102102
throw new ERR_INVALID_ARG_TYPE(
103103
'val', ['Readable', 'Iterable', 'AsyncIterable'], val);
104104
}
105105
}
106106

107-
async function* _fromReadable(val) {
107+
async function* fromReadable(val) {
108108
if (!createReadableStreamAsyncIterator) {
109109
createReadableStreamAsyncIterator =
110110
require('internal/streams/async_iterator');
111111
}
112-
113-
try {
114-
if (typeof val.read !== 'function') {
115-
// createReadableStreamAsyncIterator does not support
116-
// v1 streams. Convert it into a v2 stream.
117-
118-
if (!PassThrough) {
119-
PassThrough = require('_stream_passthrough');
120-
}
121-
122-
const pt = new PassThrough();
123-
val
124-
.on('error', (err) => pt.destroy(err))
125-
.pipe(pt);
126-
yield* createReadableStreamAsyncIterator(pt);
127-
} else {
128-
yield* createReadableStreamAsyncIterator(val);
129-
}
130-
} finally {
131-
destroyStream(val);
132-
}
112+
yield* createReadableStreamAsyncIterator(val);
133113
}
134114

135115
async function pump(iterable, writable, finish) {

0 commit comments

Comments
 (0)