http2: move process.binding('http2') to internalBinding
Refs: https://github.com/nodejs/node/issues/22160 PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
parent
c7788fba28
commit
4fa5448e5d
@ -1,8 +1,9 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const { internalBinding } = require('internal/bootstrap/loaders');
|
||||||
const Stream = require('stream');
|
const Stream = require('stream');
|
||||||
const Readable = Stream.Readable;
|
const Readable = Stream.Readable;
|
||||||
const binding = process.binding('http2');
|
const binding = internalBinding('http2');
|
||||||
const constants = binding.constants;
|
const constants = binding.constants;
|
||||||
const {
|
const {
|
||||||
ERR_HTTP2_HEADERS_SENT,
|
ERR_HTTP2_HEADERS_SENT,
|
||||||
|
@ -10,6 +10,7 @@ const {
|
|||||||
|
|
||||||
assertCrypto();
|
assertCrypto();
|
||||||
|
|
||||||
|
const { internalBinding } = require('internal/bootstrap/loaders');
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const EventEmitter = require('events');
|
const EventEmitter = require('events');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
@ -31,7 +32,6 @@ const {
|
|||||||
owner_symbol,
|
owner_symbol,
|
||||||
},
|
},
|
||||||
} = require('internal/async_hooks');
|
} = require('internal/async_hooks');
|
||||||
const { internalBinding } = require('internal/bootstrap/loaders');
|
|
||||||
const {
|
const {
|
||||||
codes: {
|
codes: {
|
||||||
ERR_HTTP2_ALTSVC_INVALID_ORIGIN,
|
ERR_HTTP2_ALTSVC_INVALID_ORIGIN,
|
||||||
@ -114,7 +114,7 @@ const {
|
|||||||
const { isArrayBufferView } = require('internal/util/types');
|
const { isArrayBufferView } = require('internal/util/types');
|
||||||
|
|
||||||
const { FileHandle } = process.binding('fs');
|
const { FileHandle } = process.binding('fs');
|
||||||
const binding = process.binding('http2');
|
const binding = internalBinding('http2');
|
||||||
const { ShutdownWrap } = process.binding('stream_wrap');
|
const { ShutdownWrap } = process.binding('stream_wrap');
|
||||||
const { UV_EOF } = internalBinding('uv');
|
const { UV_EOF } = internalBinding('uv');
|
||||||
|
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const binding = process.binding('http2');
|
const { internalBinding } = require('internal/bootstrap/loaders');
|
||||||
|
const binding = internalBinding('http2');
|
||||||
const {
|
const {
|
||||||
ERR_HTTP2_HEADER_SINGLE_VALUE,
|
ERR_HTTP2_HEADER_SINGLE_VALUE,
|
||||||
ERR_HTTP2_INVALID_CONNECTION_HEADERS,
|
ERR_HTTP2_INVALID_CONNECTION_HEADERS,
|
||||||
|
@ -80,10 +80,11 @@ let sessionStats;
|
|||||||
let streamStats;
|
let streamStats;
|
||||||
|
|
||||||
function collectHttp2Stats(entry) {
|
function collectHttp2Stats(entry) {
|
||||||
|
const http2 = internalBinding('http2');
|
||||||
switch (entry.name) {
|
switch (entry.name) {
|
||||||
case 'Http2Stream':
|
case 'Http2Stream':
|
||||||
if (streamStats === undefined)
|
if (streamStats === undefined)
|
||||||
streamStats = process.binding('http2').streamStats;
|
streamStats = http2.streamStats;
|
||||||
entry.id =
|
entry.id =
|
||||||
streamStats[IDX_STREAM_STATS_ID] >>> 0;
|
streamStats[IDX_STREAM_STATS_ID] >>> 0;
|
||||||
entry.timeToFirstByte =
|
entry.timeToFirstByte =
|
||||||
@ -99,7 +100,7 @@ function collectHttp2Stats(entry) {
|
|||||||
break;
|
break;
|
||||||
case 'Http2Session':
|
case 'Http2Session':
|
||||||
if (sessionStats === undefined)
|
if (sessionStats === undefined)
|
||||||
sessionStats = process.binding('http2').sessionStats;
|
sessionStats = http2.sessionStats;
|
||||||
entry.type =
|
entry.type =
|
||||||
sessionStats[IDX_SESSION_STATS_TYPE] >>> 0 === 0 ? 'server' : 'client';
|
sessionStats[IDX_SESSION_STATS_TYPE] >>> 0 === 0 ? 'server' : 'client';
|
||||||
entry.pingRTT =
|
entry.pingRTT =
|
||||||
|
@ -2999,4 +2999,4 @@ HTTP_STATUS_CODES(V)
|
|||||||
} // namespace http2
|
} // namespace http2
|
||||||
} // namespace node
|
} // namespace node
|
||||||
|
|
||||||
NODE_BUILTIN_MODULE_CONTEXT_AWARE(http2, node::http2::Initialize)
|
NODE_MODULE_CONTEXT_AWARE_INTERNAL(http2, node::http2::Initialize)
|
||||||
|
@ -1,11 +1,13 @@
|
|||||||
|
// Flags: --expose-internals
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const common = require('../common');
|
const common = require('../common');
|
||||||
if (!common.hasCrypto)
|
if (!common.hasCrypto)
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
|
||||||
const binding = process.binding('http2');
|
const binding = internalBinding('http2');
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
|
|
||||||
assert(binding.Http2Session);
|
assert(binding.Http2Session);
|
||||||
|
@ -5,11 +5,12 @@ const common = require('../common');
|
|||||||
if (!common.hasCrypto)
|
if (!common.hasCrypto)
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
|
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const {
|
const {
|
||||||
constants,
|
constants,
|
||||||
Http2Session,
|
Http2Session,
|
||||||
nghttp2ErrorString
|
nghttp2ErrorString
|
||||||
} = process.binding('http2');
|
} = internalBinding('http2');
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
const { NghttpError } = require('internal/http2/util');
|
const { NghttpError } = require('internal/http2/util');
|
||||||
|
|
||||||
|
@ -5,11 +5,12 @@ const common = require('../common');
|
|||||||
if (!common.hasCrypto)
|
if (!common.hasCrypto)
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const {
|
const {
|
||||||
constants,
|
constants,
|
||||||
Http2Stream,
|
Http2Stream,
|
||||||
nghttp2ErrorString
|
nghttp2ErrorString
|
||||||
} = process.binding('http2');
|
} = internalBinding('http2');
|
||||||
const { NghttpError } = require('internal/http2/util');
|
const { NghttpError } = require('internal/http2/util');
|
||||||
|
|
||||||
// tests error handling within additionalHeaders
|
// tests error handling within additionalHeaders
|
||||||
|
@ -5,7 +5,8 @@ const common = require('../common');
|
|||||||
if (!common.hasCrypto)
|
if (!common.hasCrypto)
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
const { Http2Stream } = process.binding('http2');
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
const { Http2Stream } = internalBinding('http2');
|
||||||
|
|
||||||
const server = http2.createServer();
|
const server = http2.createServer();
|
||||||
|
|
||||||
|
@ -5,11 +5,12 @@ const common = require('../common');
|
|||||||
if (!common.hasCrypto)
|
if (!common.hasCrypto)
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const {
|
const {
|
||||||
constants,
|
constants,
|
||||||
Http2Stream,
|
Http2Stream,
|
||||||
nghttp2ErrorString
|
nghttp2ErrorString
|
||||||
} = process.binding('http2');
|
} = internalBinding('http2');
|
||||||
const { NghttpError } = require('internal/http2/util');
|
const { NghttpError } = require('internal/http2/util');
|
||||||
|
|
||||||
// tests error handling within respond
|
// tests error handling within respond
|
||||||
|
@ -10,11 +10,12 @@ const fixtures = require('../common/fixtures');
|
|||||||
|
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
|
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const {
|
const {
|
||||||
constants,
|
constants,
|
||||||
Http2Stream,
|
Http2Stream,
|
||||||
nghttp2ErrorString
|
nghttp2ErrorString
|
||||||
} = process.binding('http2');
|
} = internalBinding('http2');
|
||||||
const { NghttpError } = require('internal/http2/util');
|
const { NghttpError } = require('internal/http2/util');
|
||||||
|
|
||||||
// tests error handling within processRespondWithFD
|
// tests error handling within processRespondWithFD
|
||||||
|
@ -5,11 +5,12 @@ const common = require('../common');
|
|||||||
if (!common.hasCrypto)
|
if (!common.hasCrypto)
|
||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
const http2 = require('http2');
|
const http2 = require('http2');
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const {
|
const {
|
||||||
constants,
|
constants,
|
||||||
Http2Stream,
|
Http2Stream,
|
||||||
nghttp2ErrorString
|
nghttp2ErrorString
|
||||||
} = process.binding('http2');
|
} = internalBinding('http2');
|
||||||
const { NghttpError } = require('internal/http2/util');
|
const { NghttpError } = require('internal/http2/util');
|
||||||
|
|
||||||
// tests error handling within pushStream
|
// tests error handling within pushStream
|
||||||
|
@ -9,7 +9,7 @@ if (!common.hasCrypto)
|
|||||||
common.skip('missing crypto');
|
common.skip('missing crypto');
|
||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const { mapToHeaders, toHeaderObject } = require('internal/http2/util');
|
const { mapToHeaders, toHeaderObject } = require('internal/http2/util');
|
||||||
|
const { internalBinding } = require('internal/test/binding');
|
||||||
const {
|
const {
|
||||||
HTTP2_HEADER_STATUS,
|
HTTP2_HEADER_STATUS,
|
||||||
HTTP2_HEADER_METHOD,
|
HTTP2_HEADER_METHOD,
|
||||||
@ -88,7 +88,7 @@ const {
|
|||||||
HTTP2_HEADER_HOST,
|
HTTP2_HEADER_HOST,
|
||||||
HTTP2_HEADER_KEEP_ALIVE,
|
HTTP2_HEADER_KEEP_ALIVE,
|
||||||
HTTP2_HEADER_PROXY_CONNECTION
|
HTTP2_HEADER_PROXY_CONNECTION
|
||||||
} = process.binding('http2').constants;
|
} = internalBinding('http2').constants;
|
||||||
|
|
||||||
{
|
{
|
||||||
const headers = {
|
const headers = {
|
||||||
|
@ -9,7 +9,8 @@ if (!common.hasCrypto)
|
|||||||
// by the http2 implementation.
|
// by the http2 implementation.
|
||||||
|
|
||||||
const { updateOptionsBuffer } = require('internal/http2/util');
|
const { updateOptionsBuffer } = require('internal/http2/util');
|
||||||
const { optionsBuffer } = process.binding('http2');
|
const { internalBinding } = require('internal/test/binding');
|
||||||
|
const { optionsBuffer } = internalBinding('http2');
|
||||||
const { ok, strictEqual } = require('assert');
|
const { ok, strictEqual } = require('assert');
|
||||||
|
|
||||||
const IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE = 0;
|
const IDX_OPTIONS_MAX_DEFLATE_DYNAMIC_TABLE_SIZE = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user