Skip to content

Commit 21a43bd

Browse files
lpincatargos
authored andcommitted
stream: simplify uint8ArrayToBuffer helper
The fallback code is no longer used when exporting to readable-stream. Refs: #29514 PR-URL: #30041 Fixes: #30040 Reviewed-By: Yongsheng Zhang <[email protected]> Reviewed-By: David Carlier <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent ae39039 commit 21a43bd

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

lib/stream.js

+6-17
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121

2222
'use strict';
2323

24-
const { Buffer } = require('buffer');
2524
const pipeline = require('internal/streams/pipeline');
2625
const eos = require('internal/streams/end-of-stream');
26+
const internalBuffer = require('internal/buffer');
2727

2828
// Note: export Stream before Readable/Writable/Duplex/...
2929
// to avoid a cross-reference(require) issues
@@ -42,19 +42,8 @@ Stream.finished = eos;
4242
Stream.Stream = Stream;
4343

4444
Stream._isUint8Array = require('internal/util/types').isUint8Array;
45-
46-
try {
47-
const internalBuffer = require('internal/buffer');
48-
Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
49-
return new internalBuffer.FastBuffer(chunk.buffer,
50-
chunk.byteOffset,
51-
chunk.byteLength);
52-
};
53-
} catch (e) { // eslint-disable-line no-unused-vars
54-
}
55-
56-
if (!Stream._uint8ArrayToBuffer) {
57-
Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
58-
return Buffer.prototype.slice.call(chunk);
59-
};
60-
}
45+
Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
46+
return new internalBuffer.FastBuffer(chunk.buffer,
47+
chunk.byteOffset,
48+
chunk.byteLength);
49+
};

0 commit comments

Comments
 (0)