diff --git a/lib/net.js b/lib/net.js index e1a8f1e518f8af..b6fa33498427f9 100644 --- a/lib/net.js +++ b/lib/net.js @@ -23,8 +23,9 @@ const EventEmitter = require('events'); const stream = require('stream'); -const util = require('util'); -const internalUtil = require('internal/util'); +const { inspect } = require('internal/util/inspect'); +const debug = require('internal/util/debuglog').debuglog('net'); +const { deprecate } = require('internal/util'); const { isIP, isIPv4, @@ -130,8 +131,6 @@ function getNewAsyncId(handle) { } -const debug = util.debuglog('net'); - function isPipeName(s) { return typeof s === 'string' && toNumber(s) === false; } @@ -335,7 +334,8 @@ function Socket(options) { this[kBytesRead] = 0; this[kBytesWritten] = 0; } -util.inherits(Socket, stream.Duplex); +Object.setPrototypeOf(Socket.prototype, stream.Duplex.prototype); +Object.setPrototypeOf(Socket, stream.Duplex); // Refresh existing timeouts. Socket.prototype._unrefTimer = function _unrefTimer() { @@ -1094,7 +1094,7 @@ function Server(options, connectionListener) { this._connections = 0; Object.defineProperty(this, 'connections', { - get: internalUtil.deprecate(() => { + get: deprecate(() => { if (this._usingWorkers) { return null; @@ -1102,9 +1102,9 @@ function Server(options, connectionListener) { return this._connections; }, 'Server.connections property is deprecated. ' + 'Use Server.getConnections method instead.', 'DEP0020'), - set: internalUtil.deprecate((val) => (this._connections = val), - 'Server.connections property is deprecated.', - 'DEP0020'), + set: deprecate((val) => (this._connections = val), + 'Server.connections property is deprecated.', + 'DEP0020'), configurable: true, enumerable: false }); @@ -1406,7 +1406,7 @@ Server.prototype.listen = function(...args) { 'must have the property "port" or "path"'); } - throw new ERR_INVALID_OPT_VALUE('options', util.inspect(options)); + throw new ERR_INVALID_OPT_VALUE('options', inspect(options)); }; function lookupAndListen(self, port, address, backlog, exclusive, flags) { @@ -1590,10 +1590,10 @@ Object.defineProperty(Socket.prototype, '_handle', { }); -Server.prototype.listenFD = internalUtil.deprecate(function(fd, type) { +Server.prototype.listenFD = deprecate(function(fd, type) { return this.listen({ fd: fd }); }, 'Server.listenFD is deprecated. Use Server.listen({fd: }) instead.', - 'DEP0021'); + 'DEP0021'); Server.prototype._setupWorker = function(socketList) { this._usingWorkers = true; diff --git a/test/parallel/test-net-access-byteswritten.js b/test/parallel/test-net-access-byteswritten.js index c928ab27c6d146..da63d68f6cd613 100644 --- a/test/parallel/test-net-access-byteswritten.js +++ b/test/parallel/test-net-access-byteswritten.js @@ -12,8 +12,10 @@ const tty = require('tty'); // Check that the bytesWritten getter doesn't crash if object isn't // constructed. assert.strictEqual(net.Socket.prototype.bytesWritten, undefined); -assert.strictEqual(tls.TLSSocket.super_.prototype.bytesWritten, undefined); +assert.strictEqual(Object.getPrototypeOf(tls.TLSSocket).prototype.bytesWritten, + undefined); assert.strictEqual(tls.TLSSocket.prototype.bytesWritten, undefined); -assert.strictEqual(tty.ReadStream.super_.prototype.bytesWritten, undefined); +assert.strictEqual(Object.getPrototypeOf(tty.ReadStream).prototype.bytesWritten, + undefined); assert.strictEqual(tty.ReadStream.prototype.bytesWritten, undefined); assert.strictEqual(tty.WriteStream.prototype.bytesWritten, undefined);