Skip to content

Commit 57d98bc

Browse files
committed
src: move process.binding('tcp_wrap') to internal
This commit makes the tcp_wrap builtin an internal builtin, and changes usage of the builtin from using process.binding('tcp_wrap') to use internalBinding instead. Refs: #22160 PR-URL: #22432 Refs: #22160 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 56e331a commit 57d98bc

18 files changed

+39
-21
lines changed

lib/_tls_wrap.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ const { StreamWrap } = require('_stream_wrap');
3333
const { Buffer } = require('buffer');
3434
const debug = util.debuglog('tls');
3535
const tls_wrap = process.binding('tls_wrap');
36-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
36+
const { internalBinding } = require('internal/bootstrap/loaders');
37+
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
3738
const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
3839
const { owner_symbol } = require('internal/async_hooks').symbols;
39-
const { internalBinding } = require('internal/bootstrap/loaders');
4040
const { SecureContext: NativeSecureContext } = internalBinding('crypto');
4141
const {
4242
ERR_INVALID_ARG_TYPE,

lib/internal/bootstrap/node.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,8 @@
352352
'stream_wrap',
353353
'signal_wrap',
354354
'crypto',
355-
'contextify']);
355+
'contextify',
356+
'tcp_wrap']);
356357
process.binding = function binding(name) {
357358
return internalBindingWhitelist.has(name) ?
358359
internalBinding(name) :

lib/internal/child_process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const { Process } = process.binding('process_wrap');
2727
const { WriteWrap } = internalBinding('stream_wrap');
2828
const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
2929
const { TTY } = process.binding('tty_wrap');
30-
const { TCP } = process.binding('tcp_wrap');
30+
const { TCP } = internalBinding('tcp_wrap');
3131
const { UDP } = process.binding('udp_wrap');
3232
const SocketList = require('internal/socket_list');
3333
const { owner_symbol } = require('internal/async_hooks').symbols;

lib/net.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const {
4848
TCP,
4949
TCPConnectWrap,
5050
constants: TCPConstants
51-
} = process.binding('tcp_wrap');
51+
} = internalBinding('tcp_wrap');
5252
const {
5353
Pipe,
5454
PipeConnectWrap,

src/tcp_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -375,4 +375,4 @@ Local<Object> AddressToJS(Environment* env,
375375

376376
} // namespace node
377377

378-
NODE_BUILTIN_MODULE_CONTEXT_AWARE(tcp_wrap, node::TCPWrap::Initialize)
378+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(tcp_wrap, node::TCPWrap::Initialize)

test/common/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,8 @@ function _mustCallInner(fn, criteria = 1, field) {
444444
}
445445

446446
exports.hasMultiLocalhost = function hasMultiLocalhost() {
447-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
447+
const { internalBinding } = require('internal/test/binding');
448+
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
448449
const t = new TCP(TCPConstants.SOCKET);
449450
const ret = t.bind('127.0.0.2', 0);
450451
t.close();

test/parallel/test-dgram-bind-fd-error.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ if (common.isWindows)
77
const dgram = require('dgram');
88
const assert = require('assert');
99
const { kStateSymbol } = require('internal/dgram');
10-
const { TCP, constants } = process.binding('tcp_wrap');
10+
const { internalBinding } = require('internal/test/binding');
11+
const { TCP, constants } = internalBinding('tcp_wrap');
1112
const TYPE = 'udp4';
1213

1314
// Throw when the fd is occupied according to https://github.com/libuv/libuv/pull/1851.

test/parallel/test-dgram-create-socket-handle-fd.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// Flags: --expose-internals
12
'use strict';
23
const common = require('../common');
34
if (common.isWindows)
@@ -6,7 +7,8 @@ if (common.isWindows)
67
const assert = require('assert');
78
const dgram = require('dgram');
89
const { UDP } = process.binding('udp_wrap');
9-
const { TCP, constants } = process.binding('tcp_wrap');
10+
const { internalBinding } = require('internal/test/binding');
11+
const { TCP, constants } = internalBinding('tcp_wrap');
1012
const _createSocketHandle = dgram._createSocketHandle;
1113

1214
// Return a negative number if the "existing fd" is invalid.
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1+
// Flags: --expose-internals
12
'use strict';
23
require('../common');
34

45
// This test ensures that unnecessary prototypes are no longer
56
// being generated by Environment::NewFunctionTemplate.
67

78
const assert = require('assert');
9+
const { internalBinding } = require('internal/test/binding');
810

911
[
1012
process.binding('udp_wrap').UDP.prototype.bind6,
11-
process.binding('tcp_wrap').TCP.prototype.bind6,
13+
internalBinding('tcp_wrap').TCP.prototype.bind6,
1214
process.binding('udp_wrap').UDP.prototype.send6,
13-
process.binding('tcp_wrap').TCP.prototype.bind,
15+
internalBinding('tcp_wrap').TCP.prototype.bind,
1416
process.binding('udp_wrap').UDP.prototype.close,
15-
process.binding('tcp_wrap').TCP.prototype.open
17+
internalBinding('tcp_wrap').TCP.prototype.open
1618
].forEach((binding, i) => {
1719
assert.strictEqual('prototype' in binding, false, `Test ${i} failed`);
1820
});

test/parallel/test-http-localaddress.js

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22+
// Flags: --expose-internals
2223
'use strict';
2324
const common = require('../common');
2425
if (!common.hasMultiLocalhost())

test/parallel/test-https-localaddress.js

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
2020
// USE OR OTHER DEALINGS IN THE SOFTWARE.
2121

22+
// Flags: --expose-internals
2223
'use strict';
2324
const common = require('../common');
2425
if (!common.hasCrypto)

test/parallel/test-net-persistent-nodelay.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// Flags: --expose-internals
12
'use strict';
23
require('../common');
34
const assert = require('assert');
45
const net = require('net');
5-
const TCPWrap = process.binding('tcp_wrap').TCP;
6+
const { internalBinding } = require('internal/test/binding');
7+
const TCPWrap = internalBinding('tcp_wrap').TCP;
68

79
const echoServer = net.createServer(function(connection) {
810
connection.end();

test/parallel/test-net-persistent-ref-unref.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// Flags: --expose-internals
12
'use strict';
23
require('../common');
34
const assert = require('assert');
45
const net = require('net');
5-
const TCPWrap = process.binding('tcp_wrap').TCP;
6+
const { internalBinding } = require('internal/test/binding');
7+
const TCPWrap = internalBinding('tcp_wrap').TCP;
68

79
const echoServer = net.createServer(function(conn) {
810
conn.end();

test/parallel/test-net-server-listen-handle.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
// Flags: --expose-internals
12
'use strict';
23

34
const common = require('../common');
45
const assert = require('assert');
56
const net = require('net');
67
const fs = require('fs');
78
const { getSystemErrorName } = require('util');
8-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
9+
const { internalBinding } = require('internal/test/binding');
10+
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
911
const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
1012

1113
const tmpdir = require('../common/tmpdir');

test/parallel/test-tcp-wrap-connect.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@
33
require('../common');
44
const assert = require('assert');
55
const { internalBinding } = require('internal/test/binding');
6-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
7-
const { TCPConnectWrap } = process.binding('tcp_wrap');
6+
const {
7+
TCP,
8+
constants: TCPConstants,
9+
TCPConnectWrap
10+
} = internalBinding('tcp_wrap');
811
const { ShutdownWrap } = internalBinding('stream_wrap');
912

1013
function makeConnection() {

test/parallel/test-tcp-wrap-listen.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const common = require('../common');
44
const assert = require('assert');
55

66
const { internalBinding } = require('internal/test/binding');
7-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
7+
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
88
const { WriteWrap } = internalBinding('stream_wrap');
99

1010
const server = new TCP(TCPConstants.SOCKET);

test/parallel/test-tcp-wrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
require('../common');
2525
const assert = require('assert');
2626

27-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
2827
const { internalBinding } = require('internal/test/binding');
28+
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
2929
const { UV_EINVAL } = internalBinding('uv');
3030

3131
const handle = new TCP(TCPConstants.SOCKET);

test/sequential/test-async-wrap-getasyncid.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
207207

208208
{
209209
const stream_wrap = internalBinding('stream_wrap');
210-
const tcp_wrap = process.binding('tcp_wrap');
210+
const tcp_wrap = internalBinding('tcp_wrap');
211211
const server = net.createServer(common.mustCall((socket) => {
212212
server.close();
213213
socket.on('data', () => {
@@ -256,7 +256,7 @@ if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
256256

257257

258258
if (common.hasCrypto) { // eslint-disable-line node-core/crypto-check
259-
const { TCP, constants: TCPConstants } = process.binding('tcp_wrap');
259+
const { TCP, constants: TCPConstants } = internalBinding('tcp_wrap');
260260
const tcp = new TCP(TCPConstants.SOCKET);
261261

262262
const ca = fixtures.readSync('test_ca.pem', 'ascii');

0 commit comments

Comments
 (0)