Skip to content

Commit 4fa5448

Browse files
committed
http2: move process.binding('http2') to internalBinding
Refs: #22160 PR-URL: #22328 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
1 parent c7788fb commit 4fa5448

14 files changed

+29
-17
lines changed

lib/internal/http2/compat.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
'use strict';
22

3+
const { internalBinding } = require('internal/bootstrap/loaders');
34
const Stream = require('stream');
45
const Readable = Stream.Readable;
5-
const binding = process.binding('http2');
6+
const binding = internalBinding('http2');
67
const constants = binding.constants;
78
const {
89
ERR_HTTP2_HEADERS_SENT,

lib/internal/http2/core.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const {
1010

1111
assertCrypto();
1212

13+
const { internalBinding } = require('internal/bootstrap/loaders');
1314
const assert = require('assert');
1415
const EventEmitter = require('events');
1516
const fs = require('fs');
@@ -31,7 +32,6 @@ const {
3132
owner_symbol,
3233
},
3334
} = require('internal/async_hooks');
34-
const { internalBinding } = require('internal/bootstrap/loaders');
3535
const {
3636
codes: {
3737
ERR_HTTP2_ALTSVC_INVALID_ORIGIN,
@@ -114,7 +114,7 @@ const {
114114
const { isArrayBufferView } = require('internal/util/types');
115115

116116
const { FileHandle } = process.binding('fs');
117-
const binding = process.binding('http2');
117+
const binding = internalBinding('http2');
118118
const { ShutdownWrap } = process.binding('stream_wrap');
119119
const { UV_EOF } = internalBinding('uv');
120120

lib/internal/http2/util.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
'use strict';
22

3-
const binding = process.binding('http2');
3+
const { internalBinding } = require('internal/bootstrap/loaders');
4+
const binding = internalBinding('http2');
45
const {
56
ERR_HTTP2_HEADER_SINGLE_VALUE,
67
ERR_HTTP2_INVALID_CONNECTION_HEADERS,

lib/perf_hooks.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,11 @@ let sessionStats;
8080
let streamStats;
8181

8282
function collectHttp2Stats(entry) {
83+
const http2 = internalBinding('http2');
8384
switch (entry.name) {
8485
case 'Http2Stream':
8586
if (streamStats === undefined)
86-
streamStats = process.binding('http2').streamStats;
87+
streamStats = http2.streamStats;
8788
entry.id =
8889
streamStats[IDX_STREAM_STATS_ID] >>> 0;
8990
entry.timeToFirstByte =
@@ -99,7 +100,7 @@ function collectHttp2Stats(entry) {
99100
break;
100101
case 'Http2Session':
101102
if (sessionStats === undefined)
102-
sessionStats = process.binding('http2').sessionStats;
103+
sessionStats = http2.sessionStats;
103104
entry.type =
104105
sessionStats[IDX_SESSION_STATS_TYPE] >>> 0 === 0 ? 'server' : 'client';
105106
entry.pingRTT =

src/node_http2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2999,4 +2999,4 @@ HTTP_STATUS_CODES(V)
29992999
} // namespace http2
30003000
} // namespace node
30013001

3002-
NODE_BUILTIN_MODULE_CONTEXT_AWARE(http2, node::http2::Initialize)
3002+
NODE_MODULE_CONTEXT_AWARE_INTERNAL(http2, node::http2::Initialize)

test/parallel/test-http2-binding.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
if (!common.hasCrypto)
56
common.skip('missing crypto');
67
const assert = require('assert');
8+
const { internalBinding } = require('internal/test/binding');
79

8-
const binding = process.binding('http2');
10+
const binding = internalBinding('http2');
911
const http2 = require('http2');
1012

1113
assert(binding.Http2Session);

test/parallel/test-http2-client-onconnect-errors.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ const common = require('../common');
55
if (!common.hasCrypto)
66
common.skip('missing crypto');
77

8+
const { internalBinding } = require('internal/test/binding');
89
const {
910
constants,
1011
Http2Session,
1112
nghttp2ErrorString
12-
} = process.binding('http2');
13+
} = internalBinding('http2');
1314
const http2 = require('http2');
1415
const { NghttpError } = require('internal/http2/util');
1516

test/parallel/test-http2-info-headers-errors.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ const common = require('../common');
55
if (!common.hasCrypto)
66
common.skip('missing crypto');
77
const http2 = require('http2');
8+
const { internalBinding } = require('internal/test/binding');
89
const {
910
constants,
1011
Http2Stream,
1112
nghttp2ErrorString
12-
} = process.binding('http2');
13+
} = internalBinding('http2');
1314
const { NghttpError } = require('internal/http2/util');
1415

1516
// tests error handling within additionalHeaders

test/parallel/test-http2-respond-errors.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ const common = require('../common');
55
if (!common.hasCrypto)
66
common.skip('missing crypto');
77
const http2 = require('http2');
8-
const { Http2Stream } = process.binding('http2');
8+
const { internalBinding } = require('internal/test/binding');
9+
const { Http2Stream } = internalBinding('http2');
910

1011
const server = http2.createServer();
1112

test/parallel/test-http2-respond-nghttperrors.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ const common = require('../common');
55
if (!common.hasCrypto)
66
common.skip('missing crypto');
77
const http2 = require('http2');
8+
const { internalBinding } = require('internal/test/binding');
89
const {
910
constants,
1011
Http2Stream,
1112
nghttp2ErrorString
12-
} = process.binding('http2');
13+
} = internalBinding('http2');
1314
const { NghttpError } = require('internal/http2/util');
1415

1516
// tests error handling within respond

test/parallel/test-http2-respond-with-fd-errors.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ const fixtures = require('../common/fixtures');
1010

1111
const http2 = require('http2');
1212

13+
const { internalBinding } = require('internal/test/binding');
1314
const {
1415
constants,
1516
Http2Stream,
1617
nghttp2ErrorString
17-
} = process.binding('http2');
18+
} = internalBinding('http2');
1819
const { NghttpError } = require('internal/http2/util');
1920

2021
// tests error handling within processRespondWithFD

test/parallel/test-http2-server-push-stream-errors.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ const common = require('../common');
55
if (!common.hasCrypto)
66
common.skip('missing crypto');
77
const http2 = require('http2');
8+
const { internalBinding } = require('internal/test/binding');
89
const {
910
constants,
1011
Http2Stream,
1112
nghttp2ErrorString
12-
} = process.binding('http2');
13+
} = internalBinding('http2');
1314
const { NghttpError } = require('internal/http2/util');
1415

1516
// tests error handling within pushStream

test/parallel/test-http2-util-headers-list.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if (!common.hasCrypto)
99
common.skip('missing crypto');
1010
const assert = require('assert');
1111
const { mapToHeaders, toHeaderObject } = require('internal/http2/util');
12-
12+
const { internalBinding } = require('internal/test/binding');
1313
const {
1414
HTTP2_HEADER_STATUS,
1515
HTTP2_HEADER_METHOD,
@@ -88,7 +88,7 @@ const {
8888
HTTP2_HEADER_HOST,
8989
HTTP2_HEADER_KEEP_ALIVE,
9090
HTTP2_HEADER_PROXY_CONNECTION
91-
} = process.binding('http2').constants;
91+
} = internalBinding('http2').constants;
9292

9393
{
9494
const headers = {

test/parallel/test-http2-util-update-options-buffer.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ if (!common.hasCrypto)
99
// by the http2 implementation.
1010

1111
const { updateOptionsBuffer } = require('internal/http2/util');
12-
const { optionsBuffer } = process.binding('http2');
12+
const { internalBinding } = require('internal/test/binding');
13+
const { optionsBuffer } = internalBinding('http2');
1314
const { ok, strictEqual } = require('assert');
1415

1516
const IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE = 0;

0 commit comments

Comments
 (0)