Skip to content

[v11.x backport] http: reduce usage of public util #26650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
refack wants to merge 91 commits into from
Closed

[v11.x backport] http: reduce usage of public util #26650

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
4796c7c
stream: make sure 'readable' is emitted before ending the stream
mcollina Feb 11, 2019
0c4e019
src: remove unused variable in node_http2.cc
gengjiawen Mar 2, 2019
93ef1e3
http: check for existance in resetHeadersTimeoutOnReqEnd
mcollina Mar 2, 2019
44ef6b0
src: fix build when NODE_USE_V8_PLATFORM is not defined
nitsakh Mar 1, 2019
f74d5c8
doc: fix the example implementation of MemoryRetainer
joyeecheung Feb 22, 2019
fc6023a
doc: edit deprecation section of Collaborator Guide
Trott Mar 4, 2019
3570c77
test: relax timer check in test-report-uv-handles.js
richardlau Mar 4, 2019
ff1958d
lib: migrate process.binding to internalBinding
BeniCheni Dec 11, 2018
09c83d8
crypto: add KeyObject.asymmetricKeySize
paroga Mar 2, 2019
3e6b95e
src: use the config binding to carry --no-browser-globals
joyeecheung Feb 21, 2019
b435913
src: fix wrong enum reference in node.cc
gengjiawen Mar 4, 2019
21ca939
src: remove unused function in cares_wrap.cc
gengjiawen Mar 4, 2019
4ff5cfa
src: remove redundant cast in string_search.h
gengjiawen Mar 4, 2019
b3ecaaa
tools: replace var to let/const
Mar 2, 2019
a8331fa
tools: add no-var lint rule for tools directory
Mar 6, 2019
3dd7084
build,win: simplify new `msbuild_arg` option
refack Mar 4, 2019
1351f6e
build: indicate that configure has done something
richardlau Mar 4, 2019
7d8edec
buffer: do not affect memory after target for utf16 write
addaleax Mar 4, 2019
4b1c1dc
doc: add missing https Agent maxCachedSessions
nicolas-moteau Mar 4, 2019
bd7e243
doc: standardize on End-of-Life capitalization
Trott Mar 4, 2019
aa80137
tools: update remark-preset-lint-node to 1.5.0
Trott Mar 4, 2019
2d7b629
src: remove redundant call in inspector_io.cc
gengjiawen Mar 4, 2019
539a9c0
src: make parameter name const reference in method TriggerNodeReport
gengjiawen Mar 2, 2019
5d2c522
http: remove unused variable in _http_server.js
gengjiawen Mar 3, 2019
24b9ae1
test: fix tests so they work in worker threads
richardlau Mar 5, 2019
8e94cb2
child_process: fire close event from stdio
koh110 Sep 17, 2018
8c087d2
test: remove usage of `process.binding()`
addaleax Feb 25, 2019
ab1327f
crypto: simplify GetPublicOrPrivateKeyFromJs
tniessen Mar 5, 2019
d1c225f
test: refactor test/report/test-report-signal.js
cjihrig Mar 5, 2019
8c90fe1
Revert "build: silence cpp lint by default"
refack Feb 28, 2019
f37e7bf
tools: fix test.py --shell
hashseed Mar 5, 2019
8439e07
src: remove redundant cast in util-inl.h
gengjiawen Mar 3, 2019
20fdf89
repl: add replDefaults to customize the writer
BridgeAR Jan 19, 2019
cafb332
tools: update dmn to 2.2.1 in update scripts
Trott Mar 6, 2019
dc04dc0
tools: use dmn@2.2.1 to remove unneeded files
Trott Mar 6, 2019
3b06d29
src: remove templating from StreamBase
maclover7 Dec 18, 2018
f0a144e
src: cleanup in all return paths in node::Start
gireeshpunathil Mar 6, 2019
bab6c63
doc: add caveat and tradeoff example to readline
vsemozhetbyt Mar 6, 2019
5de8ed8
doc: add guidance on console output in tests
sam-github Mar 5, 2019
4a913a2
test: bump test-bootstrap-modules.js limit
joyeecheung Mar 8, 2019
cae30d9
doc: edit "Involving the TSC"
Trott Mar 6, 2019
f7ecc94
http: improve for-loop readability in _http_outgoing.js
gengjiawen Mar 3, 2019
14e247e
n-api: improve performance creating strings
anthony-tuininga Mar 4, 2019
28b500f
src: merge debug-only `SealHandleScope`s
addaleax Mar 5, 2019
6a4bb9e
src: delete unused variable in env.h
gengjiawen Mar 5, 2019
cdf0e09
src: delete unused method SetTemplateMethodNoSideEffect
gengjiawen Mar 5, 2019
926649e
src: delete unused method SetTemplateMethod
gengjiawen Mar 5, 2019
8f0a924
tools: update `node-lint-md-cli-rollup` version 2
refack Mar 4, 2019
bda41d8
tools: update generated lint-md.js
refack Mar 4, 2019
feb3a84
src: guard against calling `Init()` multiple times
addaleax Mar 5, 2019
a2511f8
doc: fix nits in writing-tests.md
vsemozhetbyt Mar 9, 2019
ce260c2
test: de-flake test-dns-idna2008.js
refack Mar 6, 2019
7c8bb94
doc: update partner communities link in releases.md
BethGriggs Mar 6, 2019
2b57c65
benchmark,doc,lib,test: capitalize comments
BridgeAR Mar 7, 2019
06c5b84
tools: update capitalized-comments rule
BridgeAR Mar 7, 2019
96d3705
test: rewrite ocsp test to run in parallel
sam-github Mar 5, 2019
f33163a
src: apply clang-tidy various improvement
gengjiawen Mar 6, 2019
0c49ffb
doc: remove tsc-review
Trott Mar 8, 2019
cc32461
test: mark `test-worker-prof` as Flaky on ARM
refack Mar 10, 2019
7dd213f
tools: update to mdast-util-to-hast v3.0.2
rubys Aug 5, 2018
0ba661e
doc: add decode() & encode() methods into querystring.md
ZYSzys Feb 14, 2019
f91dab6
doc: document fake ENOTFOUND as a system error
cjihrig Mar 7, 2019
2eb6a40
report: fix stdout/stderr output formatting
cjihrig Mar 8, 2019
b048a38
test: cover stdout/stderr usage in triggerReport()
cjihrig Mar 8, 2019
70343d0
test: cover triggerReport() failure case
cjihrig Mar 8, 2019
9d77d47
report: rename triggerReport() to writeReport()
cjihrig Mar 8, 2019
2c0c42d
tools: update ESLint to 5.15.1
cjihrig Mar 10, 2019
119adf2
doc: edit Landing Pull Requests
Trott Mar 8, 2019
4a72eb3
doc: add inspector API example for heapdump
sam-github Mar 7, 2019
ca9bb1f
lib,src: remove usage of _externalStream
addaleax Mar 8, 2019
8d9c3fa
worker: remove `ERR_CLOSED_MESSAGE_PORT`
addaleax Mar 7, 2019
8f6b4a9
doc: document diverging MessagePort.onmessage handling
addaleax Mar 10, 2019
9af6631
process: add --pending-deprecation to `process.binding()`
addaleax Feb 25, 2019
d599ada
doc: add version for http.createServer() options addition
benswinburne Dec 12, 2018
1a0602a
crypto: check for invalid chacha20-poly1305 IVs
sam-github Mar 7, 2019
98eb711
doc: edit "Using git-node" section of Guide
Trott Mar 11, 2019
6d90c49
src: rename Init and Start overloads to something more distinctive
joyeecheung Mar 7, 2019
300ad04
test: mark test-worker-prof as flake on all platforms
refack Mar 11, 2019
066fe5a
build: enable v8's siphash for hash seed creation
rvagg Mar 1, 2019
1dd956a
deps,tools: include SipHash in LICENSE
rvagg Mar 1, 2019
b592c2f
test: fix compiler warning in test_string.c
danbev Mar 9, 2019
0ed2a01
src: remove unused variables
cjihrig Mar 11, 2019
8cb7d4b
worker: release native Worker object earlier
addaleax Mar 9, 2019
f2ebf36
url: require encodeStr from internal/querystring
ZYSzys Mar 9, 2019
c43e5b3
lib: import TextEncoder and TextDecoder from `internal/encoding`
joyeecheung Mar 9, 2019
71d0a8a
crypto: fix EdDSA support for KeyObject
mscdex Feb 26, 2019
f03498c
test: fix syntax error in test-dns-idna2008.js when failing
refack Mar 10, 2019
c6536b4
process: make Symbol.toStringTag writable
BridgeAR Mar 7, 2019
348d9a6
http2: `Http2ServerResponse.end()` should always return self
ronag Nov 13, 2018
b581bb0
test: fix test by removing node-inspect/lib/_inspect
BridgeAR Mar 12, 2019
cd77811
http: reduce usage of public util
ZYSzys Mar 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
http: reduce usage of public util 
PR-URL: #26548
Refs: #26546
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
@ZYSzys @refack
ZYSzys authored and refack committed Mar 14, 2019
commit cd77811f8fd9aedf715bef7a41ed5afe6b87439c
6 changes: 3 additions & 3 deletions lib/_http_agent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@
'use strict';

const net = require('net');
const util = require('util');
const EventEmitter = require('events');
const debug = util.debuglog('http');
const debug = require('internal/util/debuglog').debuglog('http');
const { async_id_symbol } = require('internal/async_hooks').symbols;

// New Agent code.
Expand Down Expand Up @@ -106,7 +105,8 @@ function Agent(options) {
});
}

util.inherits(Agent, EventEmitter);

@ZYSzys ZYSzys Mar 14, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since #24755 was semver-major, maybe we should keep using util.inherits here and just backport the debuglog part ?

BTW, I think it's also dependent on #26468 if I'm not wrong.

@BridgeAR BridgeAR Mar 14, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This definitely depends on #26468 and it's also the reason why the CI fails.

I have no strong opinion about the util.inherits part. I guess someone could rely on some checks that would now fail but it is quite unlikely as well. In this case I would just follow @ZYSzys and pull these changes out.

Object.setPrototypeOf(Agent.prototype, EventEmitter.prototype);
Object.setPrototypeOf(Agent, EventEmitter);

Agent.defaultMaxSockets = Infinity;

Expand Down
2 changes: 1 addition & 1 deletion lib/_http_common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const {
readStop
} = incoming;

const debug = require('util').debuglog('http');
const debug = require('internal/util/debuglog').debuglog('http');

const kIncomingMessage = Symbol('IncomingMessage');
const kOnHeaders = HTTPParser.kOnHeaders | 0;
Expand Down
4 changes: 2 additions & 2 deletions lib/_http_outgoing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

const assert = require('internal/assert');
const Stream = require('stream');
const util = require('util');
const internalUtil = require('internal/util');
const { outHeadersKey, utcDate } = require('internal/http');
const { Buffer } = require('buffer');
Expand Down Expand Up @@ -104,7 +103,8 @@ function OutgoingMessage() {

this._onPendingData = noopPendingOutput;
}
util.inherits(OutgoingMessage, Stream);
Object.setPrototypeOf(OutgoingMessage.prototype, Stream.prototype);
Object.setPrototypeOf(OutgoingMessage, Stream);


Object.defineProperty(OutgoingMessage.prototype, '_headers', {
Expand Down
7 changes: 4 additions & 3 deletions lib/_http_server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

'use strict';

const util = require('util');
const net = require('net');
const assert = require('internal/assert');
const {
Expand Down Expand Up @@ -136,7 +135,8 @@ function ServerResponse(req) {
this.shouldKeepAlive = false;
}
}
util.inherits(ServerResponse, OutgoingMessage);
Object.setPrototypeOf(ServerResponse.prototype, OutgoingMessage.prototype);
Object.setPrototypeOf(ServerResponse, OutgoingMessage);

ServerResponse.prototype._finish = function _finish() {
DTRACE_HTTP_SERVER_RESPONSE(this.connection);
Expand Down Expand Up @@ -306,7 +306,8 @@ function Server(options, requestListener) {
this.maxHeadersCount = null;
this.headersTimeout = 40 * 1000; // 40 seconds
}
util.inherits(Server, net.Server);
Object.setPrototypeOf(Server.prototype, net.Server.prototype);
Object.setPrototypeOf(Server, net.Server);


Server.prototype.setTimeout = function setTimeout(msecs, callback) {
Expand Down