Skip to content

Commit 07160cd

Browse files
Trotttargos
authored andcommitted
http2: order declarations in core.js
Order declarations: * public modules in alphabetical order * internal modules in alphabetical order * process.binding() calls in alphabetical order * exports in alphabetical order PR-URL: #21689 Reviewed-By: Gus Caplan <[email protected]> Reviewed-By: Weijia Wang <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent b758006 commit 07160cd

File tree

1 file changed

+45
-42
lines changed

1 file changed

+45
-42
lines changed

lib/internal/http2/core.js

+45-42
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,31 @@
22

33
/* eslint-disable no-use-before-define */
44

5-
const internalUtil = require('internal/util');
6-
internalUtil.assertCrypto();
5+
const {
6+
assertCrypto,
7+
customInspectSymbol: kInspect,
8+
promisify
9+
} = require('internal/util');
10+
11+
assertCrypto();
712

8-
const { internalBinding } = require('internal/bootstrap/loaders');
9-
const { async_id_symbol } = require('internal/async_hooks').symbols;
10-
const { UV_EOF } = process.binding('uv');
11-
const http = require('http');
12-
const binding = process.binding('http2');
13-
const { FileHandle } = process.binding('fs');
14-
const { StreamPipe } = internalBinding('stream_pipe');
1513
const assert = require('assert');
1614
const EventEmitter = require('events');
15+
const fs = require('fs');
16+
const http = require('http');
1717
const net = require('net');
18+
const { Duplex } = require('stream');
1819
const tls = require('tls');
20+
const { URL } = require('url');
1921
const util = require('util');
20-
const fs = require('fs');
22+
23+
const { kIncomingMessage } = require('_http_common');
24+
const { kServerResponse } = require('_http_server');
25+
const { StreamWrap } = require('_stream_wrap');
26+
27+
const { defaultTriggerAsyncIdScope } = require('internal/async_hooks');
28+
const { async_id_symbol } = require('internal/async_hooks').symbols;
29+
const { internalBinding } = require('internal/bootstrap/loaders');
2130
const {
2231
codes: {
2332
ERR_HTTP2_ALTSVC_INVALID_ORIGIN,
@@ -61,30 +70,11 @@ const {
6170
ERR_SOCKET_CLOSED
6271
}
6372
} = require('internal/errors');
64-
const { StreamWrap } = require('_stream_wrap');
65-
const { Duplex } = require('stream');
66-
const { URL } = require('url');
73+
const { utcDate } = require('internal/http');
6774
const { onServerStream,
6875
Http2ServerRequest,
6976
Http2ServerResponse,
7077
} = require('internal/http2/compat');
71-
const { utcDate } = require('internal/http');
72-
const {
73-
promisify,
74-
customInspectSymbol: kInspect
75-
} = internalUtil;
76-
const { isArrayBufferView } = require('internal/util/types');
77-
const { defaultTriggerAsyncIdScope } = require('internal/async_hooks');
78-
const { _connectionListener: httpConnectionListener } = http;
79-
const { createPromise, promiseResolve } = process.binding('util');
80-
const debug = util.debuglog('http2');
81-
82-
const kMaxFrameSize = (2 ** 24) - 1;
83-
const kMaxInt = (2 ** 32) - 1;
84-
const kMaxStreams = (2 ** 31) - 1;
85-
86-
// eslint-disable-next-line no-control-regex
87-
const kQuotedString = /^[\x09\x20-\x5b\x5d-\x7e\x80-\xff]*$/;
8878

8979
const {
9080
assertIsObject,
@@ -104,27 +94,40 @@ const {
10494
updateOptionsBuffer,
10595
updateSettingsBuffer
10696
} = require('internal/http2/util');
107-
108-
const {
109-
kTimeout,
110-
setUnrefTimeout,
111-
validateTimerDuration
112-
} = require('internal/timers');
11397
const {
11498
createWriteWrap,
11599
writeGeneric,
116100
writevGeneric
117101
} = require('internal/stream_base_commons');
102+
const {
103+
kTimeout,
104+
setUnrefTimeout,
105+
validateTimerDuration
106+
} = require('internal/timers');
107+
const { isArrayBufferView } = require('internal/util/types');
118108

109+
const { FileHandle } = process.binding('fs');
110+
const binding = process.binding('http2');
119111
const { ShutdownWrap } = process.binding('stream_wrap');
112+
const { createPromise, promiseResolve } = process.binding('util');
113+
const { UV_EOF } = process.binding('uv');
114+
115+
const { StreamPipe } = internalBinding('stream_pipe');
116+
const { _connectionListener: httpConnectionListener } = http;
117+
const debug = util.debuglog('http2');
118+
119+
const kMaxFrameSize = (2 ** 24) - 1;
120+
const kMaxInt = (2 ** 32) - 1;
121+
const kMaxStreams = (2 ** 31) - 1;
122+
123+
// eslint-disable-next-line no-control-regex
124+
const kQuotedString = /^[\x09\x20-\x5b\x5d-\x7e\x80-\xff]*$/;
125+
120126
const { constants, nameForErrorCode } = binding;
121127

122128
const NETServer = net.Server;
123129
const TLSServer = tls.Server;
124130

125-
const { kIncomingMessage } = require('_http_common');
126-
const { kServerResponse } = require('_http_server');
127-
128131
const kAlpnProtocol = Symbol('alpnProtocol');
129132
const kAuthority = Symbol('authority');
130133
const kEncrypted = Symbol('encrypted');
@@ -2815,13 +2818,13 @@ function getUnpackedSettings(buf, options = {}) {
28152818

28162819
// Exports
28172820
module.exports = {
2821+
connect,
28182822
constants,
2823+
createServer,
2824+
createSecureServer,
28192825
getDefaultSettings,
28202826
getPackedSettings,
28212827
getUnpackedSettings,
2822-
createServer,
2823-
createSecureServer,
2824-
connect,
28252828
Http2Session,
28262829
Http2Stream,
28272830
Http2ServerRequest,

0 commit comments

Comments
 (0)