Skip to content

Commit a1330af

Browse files
dnlupBridgeAR
authored andcommitted
tls: remove usage of public require('util')
Remove the usage of public require('util'), as described in: #26546 PR-URL: #26747 Refs: #26546 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent 1ac88f4 commit a1330af

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

lib/_tls_wrap.js

+12-6
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,21 @@
2121

2222
'use strict';
2323

24-
require('internal/util').assertCrypto();
24+
const {
25+
assertCrypto,
26+
deprecate
27+
} = require('internal/util');
28+
29+
assertCrypto();
2530

2631
const assert = require('internal/assert');
2732
const crypto = require('crypto');
2833
const net = require('net');
2934
const tls = require('tls');
30-
const util = require('util');
3135
const common = require('_tls_common');
3236
const JSStreamSocket = require('internal/js_stream_socket');
3337
const { Buffer } = require('buffer');
34-
const debug = util.debuglog('tls');
38+
const debug = require('internal/util/debuglog').debuglog('tls');
3539
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
3640
const tls_wrap = internalBinding('tls_wrap');
3741
const { Pipe, constants: PipeConstants } = internalBinding('pipe_wrap');
@@ -393,7 +397,8 @@ function TLSSocket(socket, opts) {
393397
// Read on next tick so the caller has a chance to setup listeners
394398
process.nextTick(initRead, this, socket);
395399
}
396-
util.inherits(TLSSocket, net.Socket);
400+
Object.setPrototypeOf(TLSSocket.prototype, net.Socket.prototype);
401+
Object.setPrototypeOf(TLSSocket, net.Socket);
397402
exports.TLSSocket = TLSSocket;
398403

399404
var proxiedMethods = [
@@ -985,7 +990,8 @@ function Server(options, listener) {
985990
}
986991
}
987992

988-
util.inherits(Server, net.Server);
993+
Object.setPrototypeOf(Server.prototype, net.Server.prototype);
994+
Object.setPrototypeOf(Server, net.Server);
989995
exports.Server = Server;
990996
exports.createServer = function createServer(options, listener) {
991997
return new Server(options, listener);
@@ -1133,7 +1139,7 @@ Server.prototype.setTicketKeys = function setTicketKeys(keys) {
11331139
};
11341140

11351141

1136-
Server.prototype.setOptions = util.deprecate(function(options) {
1142+
Server.prototype.setOptions = deprecate(function(options) {
11371143
this.requestCert = options.requestCert === true;
11381144
this.rejectUnauthorized = options.rejectUnauthorized !== false;
11391145

0 commit comments

Comments
 (0)