Skip to content

Commit fe6c419

Browse files
BeniCheniBridgeAR
authored andcommitted
lib: migrate process.binding to internalBinding
Migrate various modules from using process.binding to internalBinding. PR-URL: #24952 Refs: #22160 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Anna Henningsen <anna@addaleax.net>
1 parent a67fea5 commit fe6c419

12 files changed

Lines changed: 52 additions & 25 deletions

‎test/async-hooks/test-zlib.zlib-binding.deflate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const hooks = initHooks();
1111
hooks.enable();
1212
const{ internalBinding }=require('internal/test/binding');
1313
const{ Zlib }=internalBinding('zlib');
14-
constconstants=process.binding('constants').zlib;
14+
constconstants=internalBinding('constants').zlib;
1515

1616
consthandle=newZlib(constants.DEFLATE);
1717

‎test/parallel/test-accessor-properties.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const UDP = internalBinding('udp_wrap').UDP;
5757

5858
if(common.hasCrypto){// eslint-disable-line node-core/crypto-check
5959
// There are accessor properties in crypto too
60-
constcrypto=process.binding('crypto');
60+
constcrypto=internalBinding('crypto');
6161

6262
assert.throws(()=>{
6363
crypto.SecureContext.prototype._external;

‎test/parallel/test-binding-constants.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
// Flags: --expose-internals
12
'use strict';
23

34
require('../common');
4-
constconstants=process.binding('constants');
5+
const{ internalBinding }=require('internal/test/binding');
6+
constconstants=internalBinding('constants');
57
constassert=require('assert');
68

79
assert.deepStrictEqual(

‎test/parallel/test-child-process-spawnsync-kill-signal.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (process.argv[2] === 'child') {
99
}else{
1010
constinternalCp=require('internal/child_process');
1111
constoldSpawnSync=internalCp.spawnSync;
12-
const{SIGKILL}=process.binding('constants').os.signals;
12+
const{SIGKILL}=require('os').constants.signals;
1313

1414
functionspawn(killSignal,beforeSpawn){
1515
if(beforeSpawn){

‎test/parallel/test-child-process-spawnsync-validation-errors.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
constcommon=require('../common');
33
constassert=require('assert');
44
constspawnSync=require('child_process').spawnSync;
5-
constsignals=process.binding('constants').os.signals;
5+
constsignals=require('os').constants.signals;
66
constrootUser=common.isWindows ? false : process.getuid()===0;
77

88
constinvalidArgTypeError=common.expectsError(

‎test/parallel/test-constants.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
// Flags: --expose_internals
12
'use strict';
23

34
require('../common');
4-
constbinding=process.binding('constants');
5+
const{ internalBinding }=require('internal/test/binding');
6+
constbinding=internalBinding('constants');
57
constconstants=require('constants');
68
constassert=require('assert');
79

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const assert = require('assert');
88
constdgram=require('dgram');
99
const{ internalBinding }=require('internal/test/binding');
1010
const{UDP}=internalBinding('udp_wrap');
11-
const{UV_UDP_REUSEADDR}=process.binding('constants').os;
11+
const{UV_UDP_REUSEADDR}=require('os').constants;
1212

1313
constBUFFER_SIZE=4096;
1414

‎test/parallel/test-fs-readdir-types.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// Flags: --expose-internals
12
'use strict';
23

34
constcommon=require('../common');
@@ -6,11 +7,12 @@ const fs = require('fs');
67

78
consttmpdir=require('../common/tmpdir');
89

9-
constbinding=process.binding('fs');
10+
const{ internalBinding }=require('internal/test/binding');
11+
constbinding=internalBinding('fs');
1012

1113
constreaddirDir=tmpdir.path;
1214
constfiles=['empty','files','for','just','testing'];
13-
constconstants=process.binding('constants').fs;
15+
constconstants=require('fs').constants;
1416
consttypes={
1517
isDirectory: constants.UV_DIRENT_DIR,
1618
isFile: constants.UV_DIRENT_FILE,

‎test/parallel/test-loaders-hidden-from-users.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ common.expectsError(
1616
common.expectsError(
1717
()=>{
1818
constsource='module.exports = require("internal/bootstrap/loaders")';
19-
process.binding('natives').owo=source;
19+
const{ internalBinding }=require('internal/test/binding');
20+
internalBinding('natives').owo=source;
2021
require('owo');
2122
},{
2223
code: 'MODULE_NOT_FOUND',
Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
11
// Flags: --no-warnings
22
'use strict';
33

4-
require('../common');
4+
constcommon=require('../common');
55
constassert=require('assert');
66

77
// Assert that whitelisted internalBinding modules are accessible via
88
// process.binding().
9-
assert(process.binding('uv'));
10-
assert(process.binding('http_parser'));
11-
assert(process.binding('v8'));
12-
assert(process.binding('stream_wrap'));
13-
assert(process.binding('signal_wrap'));
14-
assert(process.binding('contextify'));
15-
assert(process.binding('url'));
16-
assert(process.binding('spawn_sync'));
17-
assert(process.binding('js_stream'));
9+
assert(process.binding('async_wrap'));
1810
assert(process.binding('buffer'));
11+
assert(process.binding('cares_wrap'));
12+
assert(process.binding('constants'));
13+
assert(process.binding('contextify'));
14+
if(common.hasCrypto){// eslint-disable-line node-core/crypto-check
15+
assert(process.binding('crypto'));
16+
}
1917
assert(process.binding('fs'));
18+
assert(process.binding('fs_event_wrap'));
19+
assert(process.binding('http_parser'));
20+
if(common.hasIntl){
21+
assert(process.binding('icu'));
22+
}
2023
assert(process.binding('inspector'));
24+
assert(process.binding('js_stream'));
25+
assert(process.binding('natives'));
2126
assert(process.binding('os'));
27+
assert(process.binding('pipe_wrap'));
28+
assert(process.binding('signal_wrap'));
29+
assert(process.binding('spawn_sync'));
30+
assert(process.binding('stream_wrap'));
31+
assert(process.binding('tcp_wrap'));
32+
if(common.hasCrypto){// eslint-disable-line node-core/crypto-check
33+
assert(process.binding('tls_wrap'));
34+
}
35+
assert(process.binding('tty_wrap'));
36+
assert(process.binding('udp_wrap'));
37+
assert(process.binding('url'));
38+
assert(process.binding('util'));
39+
assert(process.binding('uv'));
40+
assert(process.binding('v8'));
41+
assert(process.binding('zlib'));

0 commit comments

Comments
 (0)