1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

errors,tty: migrate to use internal/errors.js

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/13240
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
This commit is contained in:
Gautam Mittal 2017-05-26 08:55:18 -04:00 committed by Michael Dawson
parent f06c05cf5a
commit 3630ed1c82
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/internal/errors.js
View File

@ -123,6 +123,7 @@ E('ERR_HTTP_INVALID_STATUS_CODE',
E('ERR_INDEX_OUT_OF_RANGE', 'Index out of range'); E('ERR_INDEX_OUT_OF_RANGE', 'Index out of range');
E('ERR_INVALID_ARG_TYPE', invalidArgType); E('ERR_INVALID_ARG_TYPE', invalidArgType);
E('ERR_INVALID_CALLBACK', 'callback must be a function'); E('ERR_INVALID_CALLBACK', 'callback must be a function');
E('ERR_INVALID_FD', (fd) => `"fd" must be a positive integer: ${fd}`);
E('ERR_INVALID_FILE_URL_HOST', 'File URL host %s'); E('ERR_INVALID_FILE_URL_HOST', 'File URL host %s');
E('ERR_INVALID_FILE_URL_PATH', 'File URL path %s'); E('ERR_INVALID_FILE_URL_PATH', 'File URL path %s');
E('ERR_INVALID_HANDLE_TYPE', 'This handle type cannot be sent'); E('ERR_INVALID_HANDLE_TYPE', 'This handle type cannot be sent');

6
lib/tty.js
View File

@ -27,7 +27,7 @@ const TTY = process.binding('tty_wrap').TTY;
const isTTY = process.binding('tty_wrap').isTTY; const isTTY = process.binding('tty_wrap').isTTY;
const inherits = util.inherits; const inherits = util.inherits;
const errnoException = util._errnoException; const errnoException = util._errnoException;
const errors = require('internal/errors');
exports.isatty = function(fd) { exports.isatty = function(fd) {
return isTTY(fd); return isTTY(fd);
@ -38,7 +38,7 @@ function ReadStream(fd, options) {
if (!(this instanceof ReadStream)) if (!(this instanceof ReadStream))
return new ReadStream(fd, options); return new ReadStream(fd, options);
if (fd >> 0 !== fd || fd < 0) if (fd >> 0 !== fd || fd < 0)
throw new RangeError('fd must be positive integer: ' + fd); throw new errors.RangeError('ERR_INVALID_FD', fd);
options = util._extend({ options = util._extend({
highWaterMark: 0, highWaterMark: 0,
@ -67,7 +67,7 @@ function WriteStream(fd) {
if (!(this instanceof WriteStream)) if (!(this instanceof WriteStream))
return new WriteStream(fd); return new WriteStream(fd);
if (fd >> 0 !== fd || fd < 0) if (fd >> 0 !== fd || fd < 0)
throw new RangeError('fd must be positive integer: ' + fd); throw new errors.RangeError('ERR_INVALID_FD', fd);
net.Socket.call(this, { net.Socket.call(this, {
handle: new TTY(fd, false), handle: new TTY(fd, false),

16
test/parallel/test-ttywrap-invalid-fd.js
View File

@ -1,14 +1,17 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
const assert = require('assert'); const assert = require('assert');
const fs = require('fs'); const fs = require('fs');
const tty = require('tty'); const tty = require('tty');
assert.throws(() => { assert.throws(() => {
new tty.WriteStream(-1); new tty.WriteStream(-1);
}, /fd must be positive integer:/); }, common.expectsError({
code: 'ERR_INVALID_FD',
type: RangeError,
message: '"fd" must be a positive integer: -1'
})
);
const err_regex = common.isWindows ? const err_regex = common.isWindows ?
/^Error: EBADF: bad file descriptor, uv_tty_init$/ : /^Error: EBADF: bad file descriptor, uv_tty_init$/ :
@ -24,7 +27,12 @@ assert.throws(() => {
assert.throws(() => { assert.throws(() => {
new tty.ReadStream(-1); new tty.ReadStream(-1);
}, /fd must be positive integer:/); }, common.expectsError({
code: 'ERR_INVALID_FD',
type: RangeError,
message: '"fd" must be a positive integer: -1'
})
);
assert.throws(() => { assert.throws(() => {
let fd = 2; let fd = 2;