mirror of
https://github.com/nodejs/node.git
synced 2024-11-30 07:27:22 +01:00
7d06761f83
This commit improves the SystemError messages by allowing user to combine a custom message and the libuv error message. Also since we now prefer use subclasses to construct the errors instead of using `new errors.SystemError()` directly, this removes the behavior of assigning a default error code `ERR_SYSTEM_ERROR` to SystemError and requires the user to directly use the `ERR_SYSTEM_ERROR` class to construct errors instead. Also merges `makeNodeError` into the SystemError class definition since that's the only place the function gets used and it seems unnecessary to introduce another level of inheritance. SystemError now directly inherits from Error instead of an intermmediate Error class that inherits from Error. Class hierarchy before this patch: ERR_SOCKET_BUFFER_SIZE -> Error (use message formatted by SystemError) ERR_SYSTEM_ERROR -> NodeError (temp) -> Error After: ERR_SOCKET_BUFFER_SIZE -> SystemError -> Error ERR_TTY_INIT_FAILED -> SystemError -> Error ERR_SYSTEM_ERROR -> SystemError -> Error Error messages before this patch: ``` const dgram = require('dgram'); const socket = dgram.createSocket('udp4'); socket.setRecvBufferSize(8192); // Error [ERR_SOCKET_BUFFER_SIZE]: Could not get or set buffer // size: Error [ERR_SYSTEM_ERROR]: bad file descriptor: // EBADF [uv_recv_buffer_size] // at bufferSize (dgram.js:191:11) // at Socket.setRecvBufferSize (dgram.js:689:3) const tty = require('tty'); new tty.WriteStream(1 << 30); // Error [ERR_SYSTEM_ERROR]: invalid argument: EINVAL [uv_tty_init] // at new WriteStream (tty.js:84:11) ``` After: ``` const dgram = require('dgram'); const socket = dgram.createSocket('udp4'); socket.setRecvBufferSize(8192); // SystemError [ERR_SOCKET_BUFFER_SIZE]: Could not get or set buffer // size: uv_recv_buffer_size returned EBADF (bad file descriptor) // at bufferSize (dgram.js:191:11) // at Socket.setRecvBufferSize (dgram.js:689:3) const tty = require('tty'); new tty.WriteStream(1 << 30); // SystemError [ERR_TTY_INIT_FAILED]: TTY initialization failed: // uv_tty_init returned EINVAL (invalid argument) // at new WriteStream (tty.js:84:11) ``` PR-URL: https://github.com/nodejs/node/pull/19514 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
141 lines
4.2 KiB
JavaScript
141 lines
4.2 KiB
JavaScript
// Copyright Joyent, Inc. and other Node contributors.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a
|
|
// copy of this software and associated documentation files (the
|
|
// "Software"), to deal in the Software without restriction, including
|
|
// without limitation the rights to use, copy, modify, merge, publish,
|
|
// distribute, sublicense, and/or sell copies of the Software, and to permit
|
|
// persons to whom the Software is furnished to do so, subject to the
|
|
// following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included
|
|
// in all copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
|
|
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
|
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
'use strict';
|
|
|
|
const { inherits, _extend } = require('util');
|
|
const net = require('net');
|
|
const { TTY, isTTY } = process.binding('tty_wrap');
|
|
const errors = require('internal/errors');
|
|
const { ERR_INVALID_FD, ERR_TTY_INIT_FAILED } = errors.codes;
|
|
const readline = require('readline');
|
|
const { getColorDepth } = require('internal/tty');
|
|
|
|
function isatty(fd) {
|
|
return Number.isInteger(fd) && fd >= 0 && isTTY(fd);
|
|
}
|
|
|
|
function ReadStream(fd, options) {
|
|
if (!(this instanceof ReadStream))
|
|
return new ReadStream(fd, options);
|
|
if (fd >> 0 !== fd || fd < 0)
|
|
throw new ERR_INVALID_FD(fd);
|
|
|
|
const ctx = {};
|
|
const tty = new TTY(fd, true, ctx);
|
|
if (ctx.code !== undefined) {
|
|
throw new ERR_TTY_INIT_FAILED(ctx);
|
|
}
|
|
|
|
options = _extend({
|
|
highWaterMark: 0,
|
|
readable: true,
|
|
writable: false,
|
|
handle: tty
|
|
}, options);
|
|
|
|
net.Socket.call(this, options);
|
|
|
|
this.isRaw = false;
|
|
this.isTTY = true;
|
|
}
|
|
inherits(ReadStream, net.Socket);
|
|
|
|
ReadStream.prototype.setRawMode = function(flag) {
|
|
flag = !!flag;
|
|
this._handle.setRawMode(flag);
|
|
this.isRaw = flag;
|
|
};
|
|
|
|
function WriteStream(fd) {
|
|
if (!(this instanceof WriteStream))
|
|
return new WriteStream(fd);
|
|
if (fd >> 0 !== fd || fd < 0)
|
|
throw new ERR_INVALID_FD(fd);
|
|
|
|
const ctx = {};
|
|
const tty = new TTY(fd, false, ctx);
|
|
if (ctx.code !== undefined) {
|
|
throw new ERR_TTY_INIT_FAILED(ctx);
|
|
}
|
|
|
|
net.Socket.call(this, {
|
|
handle: tty,
|
|
readable: false,
|
|
writable: true
|
|
});
|
|
|
|
// Prevents interleaved or dropped stdout/stderr output for terminals.
|
|
// As noted in the following reference, local TTYs tend to be quite fast and
|
|
// this behavior has become expected due historical functionality on OS X,
|
|
// even though it was originally intended to change in v1.0.2 (Libuv 1.2.1).
|
|
// Ref: https://github.com/nodejs/node/pull/1771#issuecomment-119351671
|
|
this._handle.setBlocking(true);
|
|
|
|
const winSize = new Array(2);
|
|
const err = this._handle.getWindowSize(winSize);
|
|
if (!err) {
|
|
this.columns = winSize[0];
|
|
this.rows = winSize[1];
|
|
}
|
|
}
|
|
inherits(WriteStream, net.Socket);
|
|
|
|
WriteStream.prototype.isTTY = true;
|
|
|
|
WriteStream.prototype.getColorDepth = getColorDepth;
|
|
|
|
WriteStream.prototype._refreshSize = function() {
|
|
const oldCols = this.columns;
|
|
const oldRows = this.rows;
|
|
const winSize = new Array(2);
|
|
const err = this._handle.getWindowSize(winSize);
|
|
if (err) {
|
|
this.emit('error', errors.errnoException(err, 'getWindowSize'));
|
|
return;
|
|
}
|
|
const [newCols, newRows] = winSize;
|
|
if (oldCols !== newCols || oldRows !== newRows) {
|
|
this.columns = newCols;
|
|
this.rows = newRows;
|
|
this.emit('resize');
|
|
}
|
|
};
|
|
|
|
// Backwards-compat
|
|
WriteStream.prototype.cursorTo = function(x, y) {
|
|
readline.cursorTo(this, x, y);
|
|
};
|
|
WriteStream.prototype.moveCursor = function(dx, dy) {
|
|
readline.moveCursor(this, dx, dy);
|
|
};
|
|
WriteStream.prototype.clearLine = function(dir) {
|
|
readline.clearLine(this, dir);
|
|
};
|
|
WriteStream.prototype.clearScreenDown = function() {
|
|
readline.clearScreenDown(this);
|
|
};
|
|
WriteStream.prototype.getWindowSize = function() {
|
|
return [this.columns, this.rows];
|
|
};
|
|
|
|
module.exports = { isatty, ReadStream, WriteStream };
|