mirror of
https://github.com/nodejs/node.git
synced 2025-05-09 13:05:07 +00:00

The binding writeBuffer has been changed in https://github.com/nodejs/node/pull/19041 and it now requires the last argument to be a context object. makeSyncWrite was not updated accordingly, resulting assertions on Windows. This patch fixes the usage of writeBuffer there. Also fix errors.uvException() so error.message are no longer enumerable, this fixes the deepStrictEqual assertion on the error object in test-stdout-close-catch. PR-URL: https://github.com/nodejs/node/pull/19103 Refs: https://github.com/nodejs/node/pull/19041 Reviewed-By: Anna Henningsen <anna@addaleax.net>
58 lines
1.5 KiB
JavaScript
58 lines
1.5 KiB
JavaScript
'use strict';
|
|
|
|
const Buffer = require('buffer').Buffer;
|
|
const { isIPv6 } = process.binding('cares_wrap');
|
|
const { writeBuffer } = process.binding('fs');
|
|
const errors = require('internal/errors');
|
|
|
|
const octet = '(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
|
|
const re = new RegExp(`^${octet}[.]${octet}[.]${octet}[.]${octet}$`);
|
|
|
|
function isIPv4(s) {
|
|
return re.test(s);
|
|
}
|
|
|
|
function isIP(s) {
|
|
if (isIPv4(s)) return 4;
|
|
if (isIPv6(s)) return 6;
|
|
return 0;
|
|
}
|
|
|
|
// Check that the port number is not NaN when coerced to a number,
|
|
// is an integer and that it falls within the legal range of port numbers.
|
|
function isLegalPort(port) {
|
|
if ((typeof port !== 'number' && typeof port !== 'string') ||
|
|
(typeof port === 'string' && port.trim().length === 0))
|
|
return false;
|
|
return +port === (+port >>> 0) && port <= 0xFFFF;
|
|
}
|
|
|
|
function makeSyncWrite(fd) {
|
|
return function(chunk, enc, cb) {
|
|
if (enc !== 'buffer')
|
|
chunk = Buffer.from(chunk, enc);
|
|
|
|
this._bytesDispatched += chunk.length;
|
|
|
|
const ctx = {};
|
|
writeBuffer(fd, chunk, 0, chunk.length, null, undefined, ctx);
|
|
if (ctx.errno !== undefined) {
|
|
const ex = errors.uvException(ctx);
|
|
// Legacy: net writes have .code === .errno, whereas writeBuffer gives the
|
|
// raw errno number in .errno.
|
|
ex.errno = ex.code;
|
|
return cb(ex);
|
|
}
|
|
cb();
|
|
};
|
|
}
|
|
|
|
module.exports = {
|
|
isIP,
|
|
isIPv4,
|
|
isIPv6,
|
|
isLegalPort,
|
|
makeSyncWrite,
|
|
normalizedArgsSymbol: Symbol('normalizedArgs')
|
|
};
|