summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLuigi Pinca <luigipinca@gmail.com>2019-10-20 13:36:49 +0200
committerRich Trott <rtrott@gmail.com>2019-10-22 13:37:59 -0500
commit1070153cf6da6eb95644799008240825432b07e3 (patch)
tree4b82dce1c7c3d93df1d7e9dd5cd216e15c2cfa88 /lib
parent94230d15bdbfe229901b221feb5814b60f8eeedb (diff)
downloadandroid-node-v8-1070153cf6da6eb95644799008240825432b07e3.tar.gz
android-node-v8-1070153cf6da6eb95644799008240825432b07e3.tar.bz2
android-node-v8-1070153cf6da6eb95644799008240825432b07e3.zip
stream: simplify uint8ArrayToBuffer helper
The fallback code is no longer used when exporting to readable-stream. Refs: https://github.com/nodejs/node/pull/29514 PR-URL: https://github.com/nodejs/node/pull/30041 Fixes: https://github.com/nodejs/node/issues/30040 Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/stream.js23
1 files changed, 6 insertions, 17 deletions
diff --git a/lib/stream.js b/lib/stream.js
index ff8838f425..725038ba9c 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -21,9 +21,9 @@
'use strict';
-const { Buffer } = require('buffer');
const pipeline = require('internal/streams/pipeline');
const eos = require('internal/streams/end-of-stream');
+const internalBuffer = require('internal/buffer');
// Note: export Stream before Readable/Writable/Duplex/...
// to avoid a cross-reference(require) issues
@@ -42,19 +42,8 @@ Stream.finished = eos;
Stream.Stream = Stream;
Stream._isUint8Array = require('internal/util/types').isUint8Array;
-
-try {
- const internalBuffer = require('internal/buffer');
- Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
- return new internalBuffer.FastBuffer(chunk.buffer,
- chunk.byteOffset,
- chunk.byteLength);
- };
-} catch (e) { // eslint-disable-line no-unused-vars
-}
-
-if (!Stream._uint8ArrayToBuffer) {
- Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
- return Buffer.prototype.slice.call(chunk);
- };
-}
+Stream._uint8ArrayToBuffer = function _uint8ArrayToBuffer(chunk) {
+ return new internalBuffer.FastBuffer(chunk.buffer,
+ chunk.byteOffset,
+ chunk.byteLength);
+};