mirrors/nodejs
mirrors/nodejs
0
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2024-12-01 16:10:02 +01:00
Code Issues Releases Activity

stream: simplify Writable.write

Browse Source 
Slightly refactors Writable.write for minor perf
and readability improvements.

PR-URL: https://github.com/nodejs/node/pull/31146
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
This commit is contained in:
Robert Nagy 2019-12-31 12:43:54 +01:00
parent 0875837417
commit 0c7ff7fcfb
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/_stream_writable.js
View File

@ -262,12 +262,6 @@ Writable.prototype.pipe = function() {
Writable.prototype.write = function(chunk, encoding, cb) {
const state = this._writableState;
const isBuf = !state.objectMode && Stream._isUint8Array(chunk);
// Do not use Object.getPrototypeOf as it is slower since V8 7.3.
if (isBuf && !(chunk instanceof Buffer)) {
chunk = Stream._uint8ArrayToBuffer(chunk);
}
if (typeof encoding === 'function') {
cb = encoding;
@ -279,9 +273,6 @@ Writable.prototype.write = function(chunk, encoding, cb) {
cb = nop;
}
if (isBuf)
encoding = 'buffer';
let err;
if (state.ending) {
err = new ERR_STREAM_WRITE_AFTER_END();
@ -289,24 +280,31 @@ Writable.prototype.write = function(chunk, encoding, cb) {
err = new ERR_STREAM_DESTROYED('write');
} else if (chunk === null) {
err = new ERR_STREAM_NULL_VALUES();
} else {
if (!isBuf && !state.objectMode) {
if (typeof chunk !== 'string') {
err = new ERR_INVALID_ARG_TYPE('chunk', ['string', 'Buffer'], chunk);
} else if (encoding !== 'buffer' && state.decodeStrings !== false) {
} else if (!state.objectMode) {
if (typeof chunk === 'string') {
if (state.decodeStrings !== false) {
chunk = Buffer.from(chunk, encoding);
encoding = 'buffer';
}
}
if (err === undefined) {
state.pendingcb++;
return writeOrBuffer(this, state, chunk, encoding, cb);
} else if (chunk instanceof Buffer) {
encoding = 'buffer';
} else if (Stream._isUint8Array(chunk)) {
chunk = Stream._uint8ArrayToBuffer(chunk);
encoding = 'buffer';
} else {
err = new ERR_INVALID_ARG_TYPE(
'chunk', ['string', 'Buffer', 'Uint8Array'], chunk);
}
}
process.nextTick(cb, err);
errorOrDestroy(this, err, true);
return false;
if (err) {
process.nextTick(cb, err);
errorOrDestroy(this, err, true);
return false;
} else {
state.pendingcb++;
return writeOrBuffer(this, state, chunk, encoding, cb);
}
};
Writable.prototype.cork = function() {

2
test/parallel/test-net-write-arguments.js
View File

@ -33,6 +33,6 @@ socket.on('error', common.expectsError({
code: 'ERR_INVALID_ARG_TYPE',
name: 'TypeError',
message: 'The "chunk" argument must be of type string or an instance of ' +
`Buffer.${common.invalidArgTypeHelper(value)}`
`Buffer or Uint8Array.${common.invalidArgTypeHelper(value)}`
}));
});