Skip to content

Commit df073cd

Browse files
committed
tty: make process.binding('tty_wrap') internal
PR-URL: #22477 Refs: #22160 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Michaël Zasso <targos@protonmail.com>
1 parent 1abbe0a commit df073cd

15 files changed

+32
-16
lines changed

lib/internal/bootstrap/node.js

+1
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@
353353
'http_parser',
354354
'process_wrap',
355355
'v8',
356+
'tty_wrap',
356357
'stream_wrap',
357358
'signal_wrap',
358359
'crypto',

lib/internal/child_process.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ const { internalBinding } = require('internal/bootstrap/loaders');
2626
const { Process } = internalBinding('process_wrap');
2727
const { WriteWrap } = internalBinding('stream_wrap');
2828
const { Pipe, constants: PipeConstants } = process.binding('pipe_wrap');
29-
const { TTY } = process.binding('tty_wrap');
3029
const { TCP } = internalBinding('tcp_wrap');
30+
const { TTY } = internalBinding('tty_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/internal/dgram.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22
const { codes } = require('internal/errors');
3+
const { internalBinding } = require('internal/bootstrap/loaders');
34
const { UDP } = process.binding('udp_wrap');
45
const { isInt32 } = require('internal/validators');
5-
const TTYWrap = process.binding('tty_wrap');
6-
const { internalBinding } = require('internal/bootstrap/loaders');
6+
const TTYWrap = internalBinding('tty_wrap');
77
const { UV_EINVAL } = internalBinding('uv');
88
const { ERR_INVALID_ARG_TYPE, ERR_SOCKET_BAD_TYPE } = codes;
99
const kStateSymbol = Symbol('state symbol');

lib/internal/process/stdio.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ function getMainThreadStdio() {
4747

4848
function getStdin() {
4949
if (stdin) return stdin;
50-
const tty_wrap = process.binding('tty_wrap');
50+
const { internalBinding } = require('internal/bootstrap/loaders');
51+
const tty_wrap = internalBinding('tty_wrap');
5152
const fd = 0;
5253

5354
switch (tty_wrap.guessHandleType(fd)) {
@@ -163,7 +164,8 @@ function setupProcessStdio({ getStdout, getStdin, getStderr }) {
163164

164165
function createWritableStdioStream(fd) {
165166
var stream;
166-
const tty_wrap = process.binding('tty_wrap');
167+
const { internalBinding } = require('internal/bootstrap/loaders');
168+
const tty_wrap = internalBinding('tty_wrap');
167169

168170
// Note stream._type is used for test-module-load-list.js
169171

lib/net.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const {
4242
} = internalBinding('uv');
4343

4444
const { Buffer } = require('buffer');
45-
const TTYWrap = process.binding('tty_wrap');
45+
const TTYWrap = internalBinding('tty_wrap');
4646
const { ShutdownWrap } = internalBinding('stream_wrap');
4747
const {
4848
TCP,

lib/tty.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323

2424
const { inherits, _extend } = require('util');
2525
const net = require('net');
26-
const { TTY, isTTY } = process.binding('tty_wrap');
26+
const { internalBinding } = require('internal/bootstrap/loaders');
27+
const { TTY, isTTY } = internalBinding('tty_wrap');
2728
const errors = require('internal/errors');
2829
const {
2930
ERR_INVALID_FD,

src/tty_wrap.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,4 +173,4 @@ TTYWrap::TTYWrap(Environment* env,
173173

174174
} // namespace node
175175

176-
NODE_BUILTIN_MODULE_CONTEXT_AWARE(tty_wrap, node::TTYWrap::Initialize)
176+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(tty_wrap, node::TTYWrap::Initialize)

test/parallel/test-accessor-properties.js

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

34
require('../common');
@@ -9,7 +10,8 @@ const assert = require('assert');
910

1011
// Objects that call StreamBase::AddMethods, when setting up
1112
// their prototype
12-
const TTY = process.binding('tty_wrap').TTY;
13+
const { internalBinding } = require('internal/test/binding');
14+
const TTY = internalBinding('tty_wrap').TTY;
1315
const UDP = process.binding('udp_wrap').UDP;
1416

1517
{

test/parallel/test-stream-base-prototype-accessors-enumerability.js

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

34
require('../common');
@@ -9,7 +10,8 @@ require('../common');
910
const assert = require('assert');
1011

1112
// Or anything that calls StreamBase::AddMethods when setting up its prototype
12-
const TTY = process.binding('tty_wrap').TTY;
13+
const { internalBinding } = require('internal/test/binding');
14+
const TTY = internalBinding('tty_wrap').TTY;
1315

1416
{
1517
assert.strictEqual(TTY.prototype.propertyIsEnumerable('bytesRead'), false);

test/parallel/test-tty-backwards-api.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// Flags: --expose-internals
12
'use strict';
23
const common = require('../common');
34

45
const noop = () => {};
5-
const TTY = process.binding('tty_wrap').TTY = function() {};
6+
const { internalBinding } = require('internal/test/binding');
7+
const TTY = internalBinding('tty_wrap').TTY = function() {};
68

79
TTY.prototype = {
810
setBlocking: noop,

test/pseudo-tty/ref_keeps_node_running.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// Flags: --expose-internals --no-warnings
12
'use strict';
23

34
require('../common');
45

5-
const { TTY, isTTY } = process.binding('tty_wrap');
6+
const { internalBinding } = require('internal/test/binding');
7+
const { TTY, isTTY } = internalBinding('tty_wrap');
68
const strictEqual = require('assert').strictEqual;
79

810
strictEqual(isTTY(0), true, 'fd 0 is not a TTY');

test/pseudo-tty/test-async-wrap-getasyncid-tty.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
const common = require('../common');
77
const assert = require('assert');
8-
const tty_wrap = process.binding('tty_wrap');
98
const { internalBinding } = require('internal/test/binding');
109
const { TTYWRAP } = internalBinding('async_wrap').Providers;
10+
const tty_wrap = internalBinding('tty_wrap');
1111
const providers = { TTYWRAP };
1212

1313
// Make sure that the TTYWRAP Provider is tested.

test/pseudo-tty/test-handle-wrap-isrefed-tty.js

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

34
// see also test/parallel/test-handle-wrap-isrefed.js
@@ -6,7 +7,8 @@ const common = require('../common');
67
const strictEqual = require('assert').strictEqual;
78
const ReadStream = require('tty').ReadStream;
89
const tty = new ReadStream(0);
9-
const isTTY = process.binding('tty_wrap').isTTY;
10+
const { internalBinding } = require('internal/test/binding');
11+
const isTTY = internalBinding('tty_wrap').isTTY;
1012
strictEqual(isTTY(0), true, 'tty_wrap: stdin is not a TTY');
1113
strictEqual(Object.getPrototypeOf(tty._handle).hasOwnProperty('hasRef'),
1214
true, 'tty_wrap: hasRef() missing');

test/pseudo-tty/test-tty-window-size.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
// Flags: --expose-internals --no-warnings
12
'use strict';
23
const common = require('../common');
34
const assert = require('assert');
45
const { WriteStream } = require('tty');
5-
const { TTY } = process.binding('tty_wrap');
6+
const { internalBinding } = require('internal/test/binding');
7+
const { TTY } = internalBinding('tty_wrap');
68
const getWindowSize = TTY.prototype.getWindowSize;
79

810
function monkeyPatchGetWindowSize(fn) {

test/pseudo-tty/test-tty-wrap.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require('../common');
44

55
const { internalBinding } = require('internal/test/binding');
6-
const { TTY } = process.binding('tty_wrap');
6+
const { TTY } = internalBinding('tty_wrap');
77
const { WriteWrap } = internalBinding('stream_wrap');
88

99
const handle = new TTY(1);

0 commit comments

Comments
 (0)