Skip to content

Commit 0aea4d1

Browse files
BridgeARBethGriggs
authored andcommitted
benchmark,lib: change var to const
Refs: #26679 PR-URL: #26915 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Refael Ackermann <refack@gmail.com> Signed-off-by: Beth Griggs <Bethany.Griggs@uk.ibm.com>
1 parent 0f615d4 commit 0aea4d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+343
-346
lines changed

benchmark/fs/readfile-partitioned.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function main(conf) {
2929
fs.writeFileSync(filename, data);
3030
data = null;
3131

32-
var zipData = Buffer.alloc(1024, 'a');
32+
const zipData = Buffer.alloc(1024, 'a');
3333

3434
var reads = 0;
3535
var zips = 0;

benchmark/fs/write-stream-throughput.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function main({ dur, encodingType, size }) {
3838
var started = false;
3939
var ended = false;
4040

41-
var f = fs.createWriteStream(filename);
41+
const f = fs.createWriteStream(filename);
4242
f.on('drain', write);
4343
f.on('open', write);
4444
f.on('close', done);

benchmark/http/_chunky_http_client.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function main({ len, n }) {
5454
const add = 11;
5555
var count = 0;
5656
const PIPE = process.env.PIPE_NAME;
57-
var socket = net.connect(PIPE, () => {
57+
const socket = net.connect(PIPE, () => {
5858
bench.start();
5959
WriteHTTPHeaders(socket, 1, len);
6060
socket.setEncoding('utf8');

benchmark/http/http_server_for_chunky_client.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ process.env.PIPE_NAME = PIPE;
1010

1111
tmpdir.refresh();
1212

13-
var server;
14-
15-
server = http.createServer((req, res) => {
13+
const server = http.createServer((req, res) => {
1614
const headers = {
1715
'content-type': 'text/plain',
1816
'content-length': '2'

benchmark/http/set-header.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const c = 50;
1717
// setHeaderWH: setHeader(...), writeHead(status, ...)
1818
function main({ res }) {
1919
process.env.PORT = PORT;
20-
var server = require('../fixtures/simple-http-server.js')
20+
const server = require('../fixtures/simple-http-server.js')
2121
.listen(PORT)
2222
.on('listening', () => {
2323
const path = `/${type}/${len}/${chunks}/normal/${chunkedEnc}`;

benchmark/http/simple.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
1111
});
1212

1313
function main({ type, len, chunks, c, chunkedEnc, res }) {
14-
var server = require('../fixtures/simple-http-server.js')
14+
const server = require('../fixtures/simple-http-server.js')
1515
.listen(common.PORT)
1616
.on('listening', () => {
1717
const path = `/${type}/${len}/${chunks}/normal/${chunkedEnc}`;

benchmark/http/upgrade.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const resData = 'HTTP/1.1 101 Web Socket Protocol Handshake\r\n' +
1919
'\r\n\r\n';
2020

2121
function main({ n }) {
22-
var server = require('../fixtures/simple-http-server.js')
22+
const server = require('../fixtures/simple-http-server.js')
2323
.listen(common.PORT)
2424
.on('listening', () => {
2525
bench.start();

benchmark/tls/throughput.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const tls = require('tls');
1414

1515
function main({ dur, type, size }) {
1616
var encoding;
17-
var server;
1817
var chunk;
1918
switch (type) {
2019
case 'buf':
@@ -39,7 +38,7 @@ function main({ dur, type, size }) {
3938
ciphers: 'AES256-GCM-SHA384'
4039
};
4140

42-
server = tls.createServer(options, onConnection);
41+
const server = tls.createServer(options, onConnection);
4342
var conn;
4443
server.listen(common.PORT, () => {
4544
const opt = { port: common.PORT, rejectUnauthorized: false };

benchmark/tls/tls-connect.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function makeConnection() {
4646
port: common.PORT,
4747
rejectUnauthorized: false
4848
};
49-
var conn = tls.connect(options, () => {
49+
const conn = tls.connect(options, () => {
5050
clientConn++;
5151
conn.on('error', (er) => {
5252
console.error('client error', er);

lib/_http_agent.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ function Agent(options) {
6161
this.maxFreeSockets = this.options.maxFreeSockets || 256;
6262

6363
this.on('free', (socket, options) => {
64-
var name = this.getName(options);
64+
const name = this.getName(options);
6565
debug('agent.on(free)', name);
6666

6767
if (socket.writable &&
@@ -153,13 +153,13 @@ Agent.prototype.addRequest = function addRequest(req, options, port/* legacy */,
153153
if (!options.servername)
154154
options.servername = calculateServerName(options, req);
155155

156-
var name = this.getName(options);
156+
const name = this.getName(options);
157157
if (!this.sockets[name]) {
158158
this.sockets[name] = [];
159159
}
160160

161-
var freeLen = this.freeSockets[name] ? this.freeSockets[name].length : 0;
162-
var sockLen = freeLen + this.sockets[name].length;
161+
const freeLen = this.freeSockets[name] ? this.freeSockets[name].length : 0;
162+
const sockLen = freeLen + this.sockets[name].length;
163163

164164
if (freeLen) {
165165
// We have a free socket, so use that.
@@ -200,7 +200,7 @@ Agent.prototype.createSocket = function createSocket(req, options, cb) {
200200
if (!options.servername)
201201
options.servername = calculateServerName(options, req);
202202

203-
var name = this.getName(options);
203+
const name = this.getName(options);
204204
options._agentKey = name;
205205

206206
debug('createConnection', name, options);
@@ -280,9 +280,9 @@ function installListeners(agent, s, options) {
280280
}
281281

282282
Agent.prototype.removeSocket = function removeSocket(s, options) {
283-
var name = this.getName(options);
283+
const name = this.getName(options);
284284
debug('removeSocket', name, 'writable:', s.writable);
285-
var sets = [this.sockets];
285+
const sets = [this.sockets];
286286

287287
// If the socket was destroyed, remove it from the free buffers too.
288288
if (!s.writable)
@@ -324,7 +324,7 @@ Agent.prototype.reuseSocket = function reuseSocket(socket, req) {
324324
};
325325

326326
Agent.prototype.destroy = function destroy() {
327-
var sets = [this.freeSockets, this.sockets];
327+
const sets = [this.freeSockets, this.sockets];
328328
for (var s = 0; s < sets.length; s++) {
329329
var set = sets[s];
330330
var keys = Object.keys(set);

lib/_http_client.js

+28-28
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function ClientRequest(input, options, cb) {
9999
}
100100

101101
var agent = options.agent;
102-
var defaultAgent = options._defaultAgent || Agent.globalAgent;
102+
const defaultAgent = options._defaultAgent || Agent.globalAgent;
103103
if (agent === false) {
104104
agent = new defaultAgent.constructor();
105105
} else if (agent === null || agent === undefined) {
@@ -115,7 +115,7 @@ function ClientRequest(input, options, cb) {
115115
}
116116
this.agent = agent;
117117

118-
var protocol = options.protocol || defaultAgent.protocol;
118+
const protocol = options.protocol || defaultAgent.protocol;
119119
var expectedProtocol = defaultAgent.protocol;
120120
if (this.agent && this.agent.protocol)
121121
expectedProtocol = this.agent.protocol;
@@ -131,20 +131,20 @@ function ClientRequest(input, options, cb) {
131131
throw new ERR_INVALID_PROTOCOL(protocol, expectedProtocol);
132132
}
133133

134-
var defaultPort = options.defaultPort ||
134+
const defaultPort = options.defaultPort ||
135135
this.agent && this.agent.defaultPort;
136136

137-
var port = options.port = options.port || defaultPort || 80;
138-
var host = options.host = validateHost(options.hostname, 'hostname') ||
137+
const port = options.port = options.port || defaultPort || 80;
138+
const host = options.host = validateHost(options.hostname, 'hostname') ||
139139
validateHost(options.host, 'host') || 'localhost';
140140

141-
var setHost = (options.setHost === undefined || Boolean(options.setHost));
141+
const setHost = (options.setHost === undefined || Boolean(options.setHost));
142142

143143
this.socketPath = options.socketPath;
144144
this.timeout = options.timeout;
145145

146146
var method = options.method;
147-
var methodIsString = (typeof method === 'string');
147+
const methodIsString = (typeof method === 'string');
148148
if (method !== null && method !== undefined && !methodIsString) {
149149
throw new ERR_INVALID_ARG_TYPE('method', 'string', method);
150150
}
@@ -197,7 +197,7 @@ function ClientRequest(input, options, cb) {
197197
}
198198
}
199199

200-
var headersArray = Array.isArray(options.headers);
200+
const headersArray = Array.isArray(options.headers);
201201
if (!headersArray) {
202202
if (options.headers) {
203203
var keys = Object.keys(options.headers);
@@ -244,7 +244,7 @@ function ClientRequest(input, options, cb) {
244244
options.headers);
245245
}
246246

247-
var oncreate = (err, socket) => {
247+
const oncreate = (err, socket) => {
248248
if (called)
249249
return;
250250
called = true;
@@ -327,15 +327,15 @@ function emitAbortNT() {
327327

328328
function createHangUpError() {
329329
// eslint-disable-next-line no-restricted-syntax
330-
var error = new Error('socket hang up');
330+
const error = new Error('socket hang up');
331331
error.code = 'ECONNRESET';
332332
return error;
333333
}
334334

335335

336336
function socketCloseListener() {
337-
var socket = this;
338-
var req = socket._httpMessage;
337+
const socket = this;
338+
const req = socket._httpMessage;
339339
debug('HTTP socket close');
340340

341341
// Pull through final chunk, if anything is buffered.
@@ -386,8 +386,8 @@ function socketCloseListener() {
386386
}
387387

388388
function socketErrorListener(err) {
389-
var socket = this;
390-
var req = socket._httpMessage;
389+
const socket = this;
390+
const req = socket._httpMessage;
391391
debug('SOCKET ERROR:', err.message, err.stack);
392392

393393
if (req) {
@@ -400,7 +400,7 @@ function socketErrorListener(err) {
400400
// Handle any pending data
401401
socket.read();
402402

403-
var parser = socket.parser;
403+
const parser = socket.parser;
404404
if (parser) {
405405
parser.finish();
406406
freeParser(parser, req, socket);
@@ -413,16 +413,16 @@ function socketErrorListener(err) {
413413
}
414414

415415
function freeSocketErrorListener(err) {
416-
var socket = this;
416+
const socket = this;
417417
debug('SOCKET ERROR on FREE socket:', err.message, err.stack);
418418
socket.destroy();
419419
socket.emit('agentRemove');
420420
}
421421

422422
function socketOnEnd() {
423-
var socket = this;
424-
var req = this._httpMessage;
425-
var parser = this.parser;
423+
const socket = this;
424+
const req = this._httpMessage;
425+
const parser = this.parser;
426426

427427
if (!req.res && !req.socket._hadError) {
428428
// If we don't have a response then we know that the socket
@@ -438,13 +438,13 @@ function socketOnEnd() {
438438
}
439439

440440
function socketOnData(d) {
441-
var socket = this;
442-
var req = this._httpMessage;
443-
var parser = this.parser;
441+
const socket = this;
442+
const req = this._httpMessage;
443+
const parser = this.parser;
444444

445445
assert(parser && parser.socket === socket);
446446

447-
var ret = parser.execute(d);
447+
const ret = parser.execute(d);
448448
if (ret instanceof Error) {
449449
debug('parse error', ret);
450450
freeParser(parser, req, socket);
@@ -506,8 +506,8 @@ function statusIsInformational(status) {
506506

507507
// client
508508
function parserOnIncomingClient(res, shouldKeepAlive) {
509-
var socket = this.socket;
510-
var req = socket._httpMessage;
509+
const socket = this.socket;
510+
const req = socket._httpMessage;
511511

512512
debug('AGENT incoming response!');
513513

@@ -557,7 +557,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
557557
// Add our listener first, so that we guarantee socket cleanup
558558
res.on('end', responseOnEnd);
559559
req.on('prefinish', requestOnPrefinish);
560-
var handled = req.emit('response', res);
560+
const handled = req.emit('response', res);
561561

562562
// If the user did not listen for the 'response' event, then they
563563
// can't possibly read the data, so we ._dump() it into the void
@@ -573,7 +573,7 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
573573

574574
// client
575575
function responseKeepAlive(res, req) {
576-
var socket = req.socket;
576+
const socket = req.socket;
577577

578578
if (!req.shouldKeepAlive) {
579579
if (socket.writable) {
@@ -627,7 +627,7 @@ function emitFreeNT(socket) {
627627
}
628628

629629
function tickOnSocket(req, socket) {
630-
var parser = parsers.alloc();
630+
const parser = parsers.alloc();
631631
req.socket = socket;
632632
req.connection = socket;
633633
parser.reinitialize(HTTPParser.RESPONSE, parser[is_reused_symbol]);

lib/_http_incoming.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ function matchKnownFields(field, lowercased) {
244244
IncomingMessage.prototype._addHeaderLine = _addHeaderLine;
245245
function _addHeaderLine(field, value, dest) {
246246
field = matchKnownFields(field);
247-
var flag = field.charCodeAt(0);
247+
const flag = field.charCodeAt(0);
248248
if (flag === 0 || flag === 2) {
249249
field = field.slice(1);
250250
// Make a delimited list

lib/_http_outgoing.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ const kIsCorked = Symbol('isCorked');
5353

5454
const hasOwnProperty = Function.call.bind(Object.prototype.hasOwnProperty);
5555

56-
var RE_CONN_CLOSE = /(?:^|\W)close(?:$|\W)/i;
57-
var RE_TE_CHUNKED = common.chunkExpression;
56+
const RE_CONN_CLOSE = /(?:^|\W)close(?:$|\W)/i;
57+
const RE_TE_CHUNKED = common.chunkExpression;
5858

5959
// isCookieField performs a case-insensitive comparison of a provided string
6060
// against the word "cookie." As of V8 6.6 this is faster than handrolling or
@@ -161,7 +161,7 @@ OutgoingMessage.prototype._renderHeaders = function _renderHeaders() {
161161
throw new ERR_HTTP_HEADERS_SENT('render');
162162
}
163163

164-
var headersMap = this[outHeadersKey];
164+
const headersMap = this[outHeadersKey];
165165
const headers = {};
166166

167167
if (headersMap !== null) {
@@ -540,7 +540,7 @@ OutgoingMessage.prototype.removeHeader = function removeHeader(name) {
540540
throw new ERR_HTTP_HEADERS_SENT('remove');
541541
}
542542

543-
var key = name.toLowerCase();
543+
const key = name.toLowerCase();
544544

545545
switch (key) {
546546
case 'connection':
@@ -656,8 +656,8 @@ function connectionCorkNT(msg, conn) {
656656

657657
OutgoingMessage.prototype.addTrailers = function addTrailers(headers) {
658658
this._trailer = '';
659-
var keys = Object.keys(headers);
660-
var isArray = Array.isArray(headers);
659+
const keys = Object.keys(headers);
660+
const isArray = Array.isArray(headers);
661661
var field, value;
662662
for (var i = 0, l = keys.length; i < l; i++) {
663663
var key = keys[i];
@@ -720,7 +720,7 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
720720
if (typeof callback === 'function')
721721
this.once('finish', callback);
722722

723-
var finish = onFinish.bind(undefined, this);
723+
const finish = onFinish.bind(undefined, this);
724724

725725
if (this._hasBody && this.chunkedEncoding) {
726726
this._send('0\r\n' + this._trailer + '\r\n', 'latin1', finish);
@@ -773,7 +773,7 @@ OutgoingMessage.prototype._finish = function _finish() {
773773
// This function, outgoingFlush(), is called by both the Server and Client
774774
// to attempt to flush any pending messages out to the socket.
775775
OutgoingMessage.prototype._flush = function _flush() {
776-
var socket = this.socket;
776+
const socket = this.socket;
777777
var ret;
778778

779779
if (socket && socket.writable) {

0 commit comments

Comments
 (0)